Nastya flog2

Documentation/Makefile

@@ -12,6 +12,7 @@ endif
 
 FOOTER		:= footer.txt
 SRC1		+= crit.txt
+SRC1		+= compel.txt
 SRC8		+= criu.txt
 SRC		:= $(SRC1) $(SRC8)
 XMLS		:= $(patsubst %.txt,%.xml,$(SRC))

Documentation/binlog.txt

@@ -0,0 +1,52 @@
+CRIU binary logging
+===================
+
+Usage: turning on binary logging
+--------------------------------
+
+Classical text logging is done by default.
+Binary logging is turned on by the `--binlog` command line parameter.
+It should be combined with `--log-file filename` parameter to specify
+the log file name (this second parameter is used with both text and binary logging).
+
+The example:
+
+`criu --log-file /tmp/sdf.bin --binlog check`
+
+Usage: reading binary log file
+------------------------------
+
+There is a `--print-log` parameter which turnes criy into a log reader.
+It should be combined with `--log-file filename` parameter, which specifies
+the log file name. When these parameters are used, CRIU prints all messages
+from the binary log file on the screen and exits. This looks as follows:
+
+`criu --log-file /tmp/sdf.bin --binlog --print-log`
+
+Binary log file format
+----------------------
+
+Text logging in CRIU is based on the printf functions family, with format string
+followed by arguments. To make logging in binary form faster, CRIU just stores
+format string and arguments in binary log without parsing. When binary log file
+is read with `--print-log` parameter, these data are taken from the binary log
+records and passed to a printf function.
+
+Binary log file format is highly inspired by the [flog experimental project](https://github.com/cyrillos/flog).
+Each log message is stored as a format string aned a variable number of
+arguments. The variable size record has following structure:
+
+
+| field   | datatype     |  explanation                    |
+|---------|--------------|---------------------------------|
+| magic   | unsigned int | magic code, equal to `0x676f6c66` |
+| version | unsigned int | binlog file version, equal to `1` |
+| size    | unsigned int | actual size of the record (is needed because of variable arguments|
+| nargs   | unsigned int | number of arguments |
+| mask    | unsigned int | mask, which encodes the argument type, e.g. long integer or string|
+| fmt     | long         | offset to the format string, starting from the beginning of the record|
+| args[0] | long         | 1st argument: the value, if it is a number, or the offset to the string, starting from the beginning of the record |
+| .....   |              | |
+| args[nargs-1] | long   | last argument: the value, if it is a number, or the offset to the string, starting from the beginning of the record |
+| .....   |              | format string and all other strings passed as arguments, if any |
+

Documentation/compel.txt

@@ -0,0 +1,119 @@
+COMPEL(1)
+==========
+include::footer.txt[]
+
+NAME
+----
+compel - Execute parasitic code within another process.
+
+SYNOPSIS
+--------
+*compel* 'hgen' ['option' ...]
+
+*compel* 'plugins' ['PLUGIN_NAME' ...]
+
+*compel* ['--compat'] 'includes' | 'cflags' | 'ldflags'
+
+*compel* ['--compat'] ['--static'] 'libs'
+
+DESCRIPTION
+------------
+*compel* is a utility to execute arbitrary code, also called parasite code,
+in the context of a foreign process. The parasitic code, once compiled with
+compel flags and packed, can be executed in the context of other tasks. Currently
+there is only one way to load the parasitic blob into victim task using libcompel.a,
+called c-header.
+
+ARGUMENTS
+----------
+
+Positional Arguments
+~~~~~~~~~~~~~~~~~~~~
+
+*hgen*::
+    create a header from the .po file, which is the parasite binary.
+
+*plugins*::
+    prints the plugins available.
+
+*ldflags*::
+    prints the ldflags available to compel during linking of parasite code.
+
+*cflags*::
+    prints the compel cflags to be used during compilation of parasitic code.
+
+*includes*::
+    prints list of standard include directories.
+
+*libs*::
+    prints list of static or dynamic libraries that compel can link with.
+
+OPTIONS
+--------
+*-f*, *--file* 'FILE'::
+    Path to the binary file, 'FILE', which *compel* must turn into a header
+
+*-o*, *--output* 'FILE'::
+    Path to the header file, 'FILE', where compel must write the resulting header.
+
+*-p*, *--prefix* 'NAME'::
+	  Specify prefix for var names
+
+*-l*, *--log-level* 'NUM'::
+    Default log level of compel.
+
+*-h*, *--help*::
+    Prints usage and exits.
+
+*-V*, *--version*::
+    Prints version number of compel.
+
+SOURCE EXAMPLES
+----------------
+
+Parasitic Code
+~~~~~~~~~~~~~~
+
+*#include <compel/plugins/std.h>*
+
+*int parasite_trap_cmd(int cmd, void *args);* //gets called by compel_run_in_thread()
+
+*int parasite_daemon_cmd(int cmd, void *arg);* // gets called by compel_rpc_call() and compel_rpc_call_sync()
+
+*void parasite_cleanup(void);* //gets called on parasite unload by compel_cure()
+
+Infecting code
+~~~~~~~~~~~~~~
+The parasitic code is compiled and converted to a header using *compel*, and included here.
+
+*#include <compel/compel.h>*
+
+*#include "parasite.h"*
+
+Following steps are perfomed to infect the victim process:
+
+    - stop the task: *int compel_stop_task(int pid);*
+    - prepare infection handler: *struct parasite_ctl *compel_prepare(int pid);*
+    - 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);*
+
+*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.
+
+
+EXAMPLES
+---------
+To generate a header file(.h) from a parasite binary file(.po) use:
+
+----------
+    compel hgen -f parasite.po -o parasite.h
+----------
+
+'parasite.po' file is obtained by compiling the parasite source with compel flags and
+linking it with the compel plugins.
+
+AUTHOR
+------
+The CRIU team.

Documentation/criu.txt

@@ -440,6 +440,8 @@ The 'mode' may be one of the following:
     *strict*::: Restore all cgroups and their properties from the scratch,
                 requiring them to not present in the system.
 
+    *ignore*::: Don't deal with cgroups and pretend that they don't exist.
+
 *--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.
@@ -592,6 +594,33 @@ Launches *criu* in page server mode.
     remote *lazy-pages* daemon to request memory pages in random
     order.
 
+*--tls-cacert* 'file'::
+    Specifies the path to a trusted Certificate Authority (CA) certificate
+    file to be used for verification of a client or server certificate.
+    The 'file' must be in PEM format. When this option is used only the
+    specified CA is used for verification. Otherwise, the system's trusted CAs
+    and, if present, '/etc/pki/CA/cacert.pem' will be used.
+
+*--tls-cacrl* 'file'::
+    Specifies a path to a Certificate Revocation List (CRL) 'file' which
+    contains a list of revoked certificates that should no longer be trusted.
+    The 'file' must be in PEM format. When this option is not specified, the
+    file, if present, '/etc/pki/CA/cacrl.pem' will be used.
+
+*--tls-cert* 'file'::
+    Specifies a path to a file that contains a X.509 certificate to present
+    to the remote entity. The 'file' must be in PEM format. When this option
+    is not specified, the default location ('/etc/pki/criu/cert.pem') will be
+    used.
+
+*--tls-key* 'file'::
+    Specifies a path to a file that contains TLS private key. The 'file' must
+    be in PEM format. When this option is not the default location
+    ('/etc/pki/criu/private/key.pem') will be used.
+
+*--tls*::
+    Use TLS to secure remote connections.
+
 *lazy-pages*
 ~~~~~~~~~~~~
 Launches *criu* in lazy-pages daemon mode.

Makefile

@@ -35,7 +35,7 @@ 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)
+        DEFINES		:= -DCONFIG_ARMV$(ARMV) -DCONFIG_VDSO_32
 
         ifeq ($(ARMV),6)
                 USERCFLAGS += -march=armv6
@@ -46,22 +46,26 @@ ifeq ($(ARCH),arm)
         endif
 
         PROTOUFIX	:= y
+	# For simplicity - compile code in Arm mode without interwork.
+	# We could choose Thumb mode as default instead - but a dirty
+	# experiment shows that with 90Kb PIEs Thumb code doesn't save
+	# even one page. So, let's stick so far to Arm mode as it's more
+	# universal around all different Arm variations, until someone
+	# will find any use for Thumb mode. -dima
+        CFLAGS_PIE	:= -marm
 endif
 
 ifeq ($(ARCH),aarch64)
-        VDSO		:= y
         DEFINES		:= -DCONFIG_AARCH64
 endif
 
 ifeq ($(ARCH),ppc64)
         LDARCH		:= powerpc:common64
-        VDSO		:= y
         DEFINES		:= -DCONFIG_PPC64 -D__SANE_USERSPACE_TYPES__
 endif
 
 ifeq ($(ARCH),x86)
         LDARCH		:= i386:x86-64
-        VDSO		:= y
         DEFINES		:= -DCONFIG_X86_64
 endif
 
@@ -74,14 +78,15 @@ endif
 ifeq ($(ARCH),s390)
         ARCH		:= s390
         SRCARCH		:= s390
-        VDSO		:= y
         DEFINES		:= -DCONFIG_S390
         CFLAGS_PIE	:= -fno-optimize-sibling-calls
 endif
+
+CFLAGS_PIE		+= -DCR_NOGLIBC
 export CFLAGS_PIE
 
 LDARCH ?= $(SRCARCH)
-export LDARCH VDSO
+export LDARCH
 export PROTOUFIX DEFINES
 
 #
@@ -122,9 +127,12 @@ ifeq ($(GMON),1)
 export GMON GMONLDOPT
 endif
 
+CFLAGS			+= -iquote flog/include/ -iquote flog/include/uapi
+
+AFLAGS			+= -D__ASSEMBLY__
 CFLAGS			+= $(USERCFLAGS) $(WARNINGS) $(DEFINES) -iquote include/
 HOSTCFLAGS		+= $(WARNINGS) $(DEFINES) -iquote include/
-export CFLAGS USERCLFAGS HOSTCFLAGS
+export AFLAGS CFLAGS USERCLFAGS HOSTCFLAGS
 
 # Default target
 all: criu lib crit
@@ -187,6 +195,7 @@ include Makefile.config
 else
 # To clean all files, enable make/build options here
 export CONFIG_COMPAT := y
+export CONFIG_GNUTLS := y
 endif
 
 #
@@ -211,6 +220,17 @@ soccr/built-in.o: $(CONFIG_HEADER) .FORCE
 $(SOCCR_A): |soccr/built-in.o
 criu-deps	+= $(SOCCR_A)
 
+#
+# Fast logging library
+FLOG_A := flog/libflog.a
+flog/Makefile: ;
+flog/%: $(CONFIG_HEADER) .FORCE
+	$(Q) $(MAKE) $(build)=flog $@
+flog/built-in.o: $(CONFIG_HEADER) .FORCE
+	$(Q) $(MAKE) $(build)=flog all
+$(FLOG_A): | flog/built-in.o
+criu-deps	+= $(FLOG_A)
+
 #
 # CRIU building done in own directory
 # with slightly different rules so we
@@ -373,9 +393,11 @@ help:
 .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/py/images/pb2dict.py
 
 include Makefile.install
 

Makefile.config

@@ -15,6 +15,14 @@ ifeq ($(call pkg-config-check,libselinux),y)
         FEATURE_DEFINES	+= -DCONFIG_HAS_SELINUX
 endif
 
+ifeq ($(NO_GNUTLS)x$(call pkg-config-check,gnutls),xy)
+        LIBS_FEATURES	+= -lgnutls
+        export CONFIG_GNUTLS := y
+        FEATURE_DEFINES	+= -DCONFIG_GNUTLS
+else
+        $(info Note: Building without GnuTLS support)
+endif
+
 export LIBS += $(LIBS_FEATURES)
 
 CONFIG_FILE = .config
@@ -57,10 +65,6 @@ $(CONFIG_HEADER): scripts/feature-tests.mak $(CONFIG_FILE)
 	$(Q) echo ''							>> $$@
 $(call map,gen-feature-test,$(FEATURES_LIST))
 	$(Q) cat $(CONFIG_FILE) | sed -n -e '/^[^#]/s/^/#define CONFIG_/p' >> $$@
-ifeq ($$(VDSO),y)
-	$(Q) echo '#define CONFIG_VDSO'				>> $$@
-	$(Q) echo ''							>> $$@
-endif
 	$(Q) echo '#endif /* __CR_CONFIG_H__ */'			>> $$@
 endef
 

compel/Makefile

@@ -11,7 +11,6 @@ ccflags-y		+= -iquote compel/arch/$(ARCH)/src/lib/include
 ccflags-y		+= -iquote compel/include
 ccflags-y		+= -fno-strict-aliasing
 ccflags-y		+= -fPIC
-ccflags-y		+= $(CFLAGS_PIE)
 ldflags-y		+= -r
 
 #

compel/arch/arm/plugins/std/syscalls/syscall-aux.h

@@ -3,25 +3,25 @@
 #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