[CRIU] [PATCH 00/38] compel: Preparatory work for infect engine move in
Cyrill Gorcunov
gorcunov at openvz.org
Tue Oct 11 09:03:50 PDT 2016
Here are code movements in a sake of cutting off infect engine and moving
it into compel library. Note I only did build-test for local x86 instance.
Pavel, the series is on top of your criu-compel branch and sits on my
libcompel-4 branch. The further work will be done on top of this series
in libcompel-5 branch.
Cyrill Gorcunov (38):
criu: Fix strict prototypes
compel: cli -- Add more flags into cflags report
compel: Add arguments packing helper
nmk: built.mk -- Add missing space
compel: criu -- Use std plugin directly
criu: arch -- Fix more task_size prototype
compel: plugins,std -- Implement simple memcpy for non x86 archs
compel: uapi -- Add loglevels.h header
compel: Add simple logging
compel: Use xmalloc in argv
compel: Implement pack action
compel: x86 -- Update linking script to include missed exit section
compel: Lets use built-in.o postfix in compel shipped plugins
compel: Don't look into CRIU include folder
compel: Drop using custom uX and sX types but switch to stdint
compel: Move headers to compel/include/compel
compel: Test for pack action results
compel: Disable tests for a while
compel: Use compel_ prefix in uapi
compel: cli -- Add missing break
compel: Export version to userspace
compel: Import bug.h header
criu: futex -- Use portable int types
compel: Share futex from criu code
compel: Move arch headers into compel dir
criu: x86 -- Make fpu.h to use stdint.h
compel: Move infect-rpc.h into compel
criu: Wire in compel library
compel: Move fpu.h into compel
compel: Move sigframe from criu to compel
compel: Wire in page.h
compel: Wire in types.h
compel: Move in bitops
compel: Move atomics and related into
compel: Move lock into compel directly
compel: Move into ptrace code
compel: Generate link to config.h
compel: types -- Move into ARCH_SI_TRAP and __NR helpers
Makefile | 6 +-
Makefile.compel | 11 +-
compel/Makefile | 15 +-
compel/arch/aarch64/src/lib/handle-elf.c | 1 +
.../aarch64/src/lib/include/compel}/asm/atomic.h | 0
.../aarch64/src/lib/include/compel}/asm/bitops.h | 3 +-
.../src/lib/include/compel}/asm/bitsperlong.h | 0
.../arch/aarch64/src/lib/include/compel}/asm/cpu.h | 0
.../arch/aarch64/src/lib/include/compel}/asm/fpu.h | 0
.../aarch64/src/lib/include/compel}/asm/page.h | 0
.../src/lib/include/compel}/asm/processor-flags.h | 0
.../aarch64/src/lib/include/compel/asm/sigframe.h | 51 +++++
.../aarch64/src/lib/include/compel/asm/types.h | 59 ++++++
.../src/lib/include/{ => compel}/handle-elf.h | 0
compel/arch/arm/plugins/std/syscalls/syscall.def | 4 +-
compel/arch/arm/src/lib/handle-elf.c | 1 +
.../arch/arm/src/lib/include/compel}/asm/atomic.h | 2 +-
.../arch/arm/src/lib/include/compel}/asm/bitops.h | 3 +-
.../arm/src/lib/include/compel}/asm/bitsperlong.h | 0
.../arch/arm/src/lib/include/compel}/asm/cpu.h | 0
.../arch/arm/src/lib/include/compel}/asm/fpu.h | 0
.../arch/arm/src/lib/include/compel}/asm/page.h | 0
.../src/lib/include/compel}/asm/processor-flags.h | 0
.../arm/src/lib/include/compel}/asm/processor.h | 0
.../arch/arm/src/lib/include/compel/asm/sigframe.h | 85 ++++++++
compel/arch/arm/src/lib/include/compel/asm/types.h | 92 ++++++++
.../arm/src/lib/include/{ => compel}/handle-elf.h | 0
.../ppc64/plugins/std/syscalls/syscall-ppc64.tbl | 4 +-
compel/arch/ppc64/src/lib/handle-elf.c | 1 +
.../ppc64/src/lib/include/compel}/asm/atomic.h | 2 +-
.../ppc64/src/lib/include/compel}/asm/bitops.h | 3 +-
.../src/lib/include/compel}/asm/bitsperlong.h | 0
.../ppc64/src/lib/include/compel}/asm/cmpxchg.h | 0
.../arch/ppc64/src/lib/include/compel}/asm/cpu.h | 0
.../arch/ppc64/src/lib/include/compel}/asm/fpu.h | 0
.../arch/ppc64/src/lib/include/compel}/asm/page.h | 0
.../src/lib/include/compel}/asm/processor-flags.h | 0
.../ppc64/src/lib/include/compel/asm/sigframe.h | 66 ++++++
.../arch/ppc64/src/lib/include/compel/asm/types.h | 99 +++++++++
.../src/lib/include/{ => compel}/handle-elf.h | 0
compel/arch/x86/plugins/std/syscalls/syscall32.c | 24 +--
.../arch/x86/plugins/std/syscalls/syscall_32.tbl | 8 +-
.../arch/x86/plugins/std/syscalls/syscall_64.tbl | 4 +-
compel/arch/x86/scripts/pack.lds.S | 7 +-
compel/arch/x86/src/lib/handle-elf.c | 1 +
.../arch/x86/src/lib/include/compel}/asm/atomic.h | 2 +-
.../arch/x86/src/lib/include/compel}/asm/bitops.h | 3 +-
.../x86/src/lib/include/compel}/asm/bitsperlong.h | 0
.../arch/x86/src/lib/include/compel}/asm/cmpxchg.h | 10 +-
compel/arch/x86/src/lib/include/compel/asm/cpu.h | 177 ++++++++++++++++
.../arch/x86/src/lib/include/compel}/asm/fpu.h | 60 +++---
.../arch/x86/src/lib/include/compel}/asm/page.h | 0
.../src/lib/include/compel}/asm/processor-flags.h | 0
.../arch/x86/src/lib/include/compel/asm/sigframe.h | 231 +++++++++++++++++++++
compel/arch/x86/src/lib/include/compel/asm/types.h | 161 ++++++++++++++
.../x86/src/lib/include/{ => compel}/handle-elf.h | 0
.../include/compel}/asm-generic/bitops.h | 3 +-
compel/include/compel/bug.h | 1 +
compel/include/compel/compiler.h | 1 +
compel/include/{ => compel}/elf32-types.h | 0
compel/include/{ => compel}/elf64-types.h | 0
compel/include/compel/infect-rpc.h | 20 ++
compel/include/compel/lock.h | 159 ++++++++++++++
compel/include/compel/log.h | 62 ++++++
compel/include/compel/piegen.h | 31 +++
compel/include/compel/ptrace.h | 81 ++++++++
compel/include/{ => compel}/shmem.h | 0
compel/include/compel/sigframe-common.h | 56 +++++
compel/include/compel/xmalloc.h | 1 +
compel/include/compiler.h | 1 -
compel/include/int.h | 1 -
compel/include/piegen.h | 54 -----
compel/include/uapi/compel.h | 19 ++
compel/include/uapi/loglevels.h | 13 ++
compel/plugins/Makefile | 1 +
compel/plugins/include/uapi/std/syscall-types.h | 13 +-
compel/plugins/std/std.c | 1 -
compel/plugins/std/string.c | 8 +-
compel/src/lib/argv.c | 41 ++++
compel/src/lib/compel.c | 17 ++
compel/src/lib/handle-elf.c | 37 ++--
compel/src/lib/log-host.c | 1 +
compel/src/lib/log.c | 93 +++++++++
compel/src/lib/pack-host.c | 1 +
compel/src/lib/pack.c | 83 ++++++++
{criu => compel/src/lib}/ptrace.c | 17 +-
compel/src/main.c | 49 ++++-
criu/Makefile | 2 +
criu/Makefile.crtools | 2 +-
criu/aio.c | 2 +-
criu/arch/aarch64/crtools.c | 4 +-
criu/arch/aarch64/include/asm/parasite-syscall.h | 4 -
criu/arch/aarch64/include/asm/restorer.h | 49 +----
criu/arch/aarch64/include/asm/types.h | 49 +----
criu/arch/aarch64/restorer.c | 2 +-
criu/arch/arm/crtools.c | 4 +-
criu/arch/arm/include/asm/parasite-syscall.h | 4 -
criu/arch/arm/include/asm/restorer.h | 79 +------
criu/arch/arm/include/asm/types.h | 87 +-------
criu/arch/arm/restorer.c | 2 +-
criu/arch/ppc64/crtools.c | 4 +-
criu/arch/ppc64/include/asm/parasite-syscall.h | 4 -
criu/arch/ppc64/include/asm/restorer.h | 59 +-----
criu/arch/ppc64/include/asm/types.h | 85 +-------
criu/arch/ppc64/restorer.c | 2 +-
criu/arch/x86/cpu.c | 4 +-
criu/arch/x86/crtools.c | 6 +-
criu/arch/x86/include/asm/cpu.h | 177 +---------------
criu/arch/x86/include/asm/parasite-syscall.h | 13 --
criu/arch/x86/include/asm/restorer.h | 207 +-----------------
criu/arch/x86/include/asm/types.h | 150 +------------
criu/arch/x86/restorer.c | 2 +-
criu/arch/x86/sigaction_compat.c | 2 +-
criu/bfd.c | 2 +-
criu/bitmap.c | 2 +-
criu/cr-check.c | 2 +-
criu/cr-dump.c | 2 +-
criu/cr-exec.c | 2 +-
criu/cr-restore.c | 6 +-
criu/files-reg.c | 2 +-
criu/include/cpu.h | 2 +-
criu/include/infect-rpc.h | 20 --
criu/include/lock.h | 154 +-------------
criu/include/pagemap-cache.h | 2 +-
criu/include/ptrace.h | 80 -------
criu/include/restorer.h | 2 +-
criu/include/sigframe.h | 42 +---
criu/include/sockets.h | 2 +-
criu/infect-rpc.c | 2 +-
criu/infect.c | 4 +-
criu/mem.c | 2 +-
criu/parasite-syscall.c | 6 +-
criu/pie/Makefile | 8 +-
criu/pie/parasite-vdso.c | 2 +-
criu/pie/parasite.c | 8 +-
criu/pie/pie-reloc.lds.S.in | 2 +
criu/seccomp.c | 2 +-
criu/seize.c | 2 +-
criu/shmem.c | 2 +-
criu/sockets.c | 2 +-
criu/stats.c | 2 +-
criu/uffd.c | 2 +-
criu/vdso.c | 2 +-
scripts/nmk/scripts/build.mk | 2 +-
144 files changed, 1951 insertions(+), 1487 deletions(-)
rename {criu/arch/aarch64/include => compel/arch/aarch64/src/lib/include/compel}/asm/atomic.h (100%)
rename {criu/arch/aarch64/include => compel/arch/aarch64/src/lib/include/compel}/asm/bitops.h (62%)
rename {criu/arch/ppc64/include => compel/arch/aarch64/src/lib/include/compel}/asm/bitsperlong.h (100%)
rename {criu/arch/ppc64/include => compel/arch/aarch64/src/lib/include/compel}/asm/cpu.h (100%)
rename {criu/arch/ppc64/include => compel/arch/aarch64/src/lib/include/compel}/asm/fpu.h (100%)
rename {criu/arch/aarch64/include => compel/arch/aarch64/src/lib/include/compel}/asm/page.h (100%)
rename {criu/arch/ppc64/include => compel/arch/aarch64/src/lib/include/compel}/asm/processor-flags.h (100%)
create mode 100644 compel/arch/aarch64/src/lib/include/compel/asm/sigframe.h
create mode 100644 compel/arch/aarch64/src/lib/include/compel/asm/types.h
rename compel/arch/aarch64/src/lib/include/{ => compel}/handle-elf.h (100%)
rename {criu/arch/arm/include => compel/arch/arm/src/lib/include/compel}/asm/atomic.h (98%)
rename {criu/arch/arm/include => compel/arch/arm/src/lib/include/compel}/asm/bitops.h (62%)
rename {criu/arch/arm/include => compel/arch/arm/src/lib/include/compel}/asm/bitsperlong.h (100%)
rename {criu/arch/arm/include => compel/arch/arm/src/lib/include/compel}/asm/cpu.h (100%)
rename {criu/arch/arm/include => compel/arch/arm/src/lib/include/compel}/asm/fpu.h (100%)
rename {criu/arch/x86/include => compel/arch/arm/src/lib/include/compel}/asm/page.h (100%)
rename {criu/arch/arm/include => compel/arch/arm/src/lib/include/compel}/asm/processor-flags.h (100%)
rename {criu/arch/arm/include => compel/arch/arm/src/lib/include/compel}/asm/processor.h (100%)
create mode 100644 compel/arch/arm/src/lib/include/compel/asm/sigframe.h
create mode 100644 compel/arch/arm/src/lib/include/compel/asm/types.h
rename compel/arch/arm/src/lib/include/{ => compel}/handle-elf.h (100%)
rename {criu/arch/ppc64/include => compel/arch/ppc64/src/lib/include/compel}/asm/atomic.h (98%)
rename {criu/arch/ppc64/include => compel/arch/ppc64/src/lib/include/compel}/asm/bitops.h (99%)
rename {criu/arch/aarch64/include => compel/arch/ppc64/src/lib/include/compel}/asm/bitsperlong.h (100%)
rename {criu/arch/ppc64/include => compel/arch/ppc64/src/lib/include/compel}/asm/cmpxchg.h (100%)
rename {criu/arch/aarch64/include => compel/arch/ppc64/src/lib/include/compel}/asm/cpu.h (100%)
rename {criu/arch/aarch64/include => compel/arch/ppc64/src/lib/include/compel}/asm/fpu.h (100%)
rename {criu/arch/ppc64/include => compel/arch/ppc64/src/lib/include/compel}/asm/page.h (100%)
rename {criu/arch/aarch64/include => compel/arch/ppc64/src/lib/include/compel}/asm/processor-flags.h (100%)
create mode 100644 compel/arch/ppc64/src/lib/include/compel/asm/sigframe.h
create mode 100644 compel/arch/ppc64/src/lib/include/compel/asm/types.h
rename compel/arch/ppc64/src/lib/include/{ => compel}/handle-elf.h (100%)
rename {criu/arch/x86/include => compel/arch/x86/src/lib/include/compel}/asm/atomic.h (97%)
rename {criu/arch/x86/include => compel/arch/x86/src/lib/include/compel}/asm/bitops.h (97%)
rename {criu/arch/x86/include => compel/arch/x86/src/lib/include/compel}/asm/bitsperlong.h (100%)
rename {criu/arch/x86/include => compel/arch/x86/src/lib/include/compel}/asm/cmpxchg.h (91%)
create mode 100644 compel/arch/x86/src/lib/include/compel/asm/cpu.h
rename {criu/arch/x86/include => compel/arch/x86/src/lib/include/compel}/asm/fpu.h (54%)
rename {criu/arch/arm/include => compel/arch/x86/src/lib/include/compel}/asm/page.h (100%)
rename {criu/arch/x86/include => compel/arch/x86/src/lib/include/compel}/asm/processor-flags.h (100%)
create mode 100644 compel/arch/x86/src/lib/include/compel/asm/sigframe.h
create mode 100644 compel/arch/x86/src/lib/include/compel/asm/types.h
rename compel/arch/x86/src/lib/include/{ => compel}/handle-elf.h (100%)
rename {criu/include => compel/include/compel}/asm-generic/bitops.h (97%)
create mode 120000 compel/include/compel/bug.h
create mode 120000 compel/include/compel/compiler.h
rename compel/include/{ => compel}/elf32-types.h (100%)
rename compel/include/{ => compel}/elf64-types.h (100%)
create mode 100644 compel/include/compel/infect-rpc.h
create mode 100644 compel/include/compel/lock.h
create mode 100644 compel/include/compel/log.h
create mode 100644 compel/include/compel/piegen.h
create mode 100644 compel/include/compel/ptrace.h
rename compel/include/{ => compel}/shmem.h (100%)
create mode 100644 compel/include/compel/sigframe-common.h
create mode 120000 compel/include/compel/xmalloc.h
delete mode 120000 compel/include/compiler.h
delete mode 120000 compel/include/int.h
delete mode 100644 compel/include/piegen.h
create mode 100644 compel/include/uapi/loglevels.h
create mode 100644 compel/src/lib/argv.c
create mode 100644 compel/src/lib/compel.c
create mode 120000 compel/src/lib/log-host.c
create mode 100644 compel/src/lib/log.c
create mode 120000 compel/src/lib/pack-host.c
create mode 100644 compel/src/lib/pack.c
rename {criu => compel/src/lib}/ptrace.c (82%)
delete mode 100644 criu/include/infect-rpc.h
delete mode 100644 criu/include/ptrace.h
--
2.7.4
More information about the CRIU
mailing list