[GSoC 2021] Introduce io_uring dump/restore support

.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
@@ -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

.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

.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:

.github/workflows/cross-compile.yml

@@ -6,9 +6,26 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
+      fail-fast: false
       matrix:
-        target: [armv7-cross, aarch64-cross, ppc64-cross, mips64el-cross]
+        experimental: [false]
+        target: [
+          armv7-stable-cross,
+          aarch64-stable-cross,
+          ppc64-stable-cross,
+          mips64el-stable-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

.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

.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"

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&utm_medium=referral&utm_content=xemul/criu&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

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
@@ -328,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*::
@@ -360,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
@@ -408,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*:::
@@ -521,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
@@ -645,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*:::

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)
@@ -147,7 +147,7 @@ HOSTCFLAGS		+= $(WARNINGS) $(DEFINES) -iquote include/
 export AFLAGS CFLAGS USERCLFAGS HOSTCFLAGS
 
 # Default target
-all: criu lib crit
+all: flog criu lib crit
 .PHONY: all
 
 #
@@ -233,6 +233,15 @@ soccr/built-in.o: $(CONFIG_HEADER) .FORCE
 $(SOCCR_A): |soccr/built-in.o
 criu-deps	+= $(SOCCR_A)
 
+#flog gets used by criu, build it earlier
+
+flogMakefile: ;
+flog%:
+	$(Q) $(MAKE) $(build)=flog $@
+flog:
+	$(Q) $(MAKE) $(build)=flog all
+.PHONY: flog
+
 #
 # CRIU building done in own directory
 # with slightly different rules so we
@@ -275,6 +284,7 @@ lib: crit
 
 clean mrproper:
 	$(Q) $(MAKE) $(build)=images $@
+	$(Q) $(MAKE) $(build)=flog $@
 	$(Q) $(MAKE) $(build)=criu $@
 	$(Q) $(MAKE) $(build)=soccr $@
 	$(Q) $(MAKE) $(build)=lib $@
@@ -284,15 +294,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 +334,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
@@ -409,11 +427,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"'
@@ -429,7 +449,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

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

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>

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));

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));

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)