Commits · dec9a2505416bd43333a8b4e6e2ebbf0b09c1cba · zhul / criu

14 Mar, 2017 40 commits

infect: Move processor-flags.h into compel · dec9a250

Pavel Emelyanov authored Oct 27, 2016

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

dec9a250

infect: Move errno.h to compel · 468a6492

Pavel Emelyanov authored Oct 27, 2016

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

468a6492

infect: Reshuffle headers · 3a90e8e7

Pavel Emelyanov authored Oct 27, 2016

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

3a90e8e7

infect: Move __NR32_mmap into compel headers · f15dfc61

Pavel Emelyanov authored Oct 27, 2016

This remove parasite-syscall.h from infect.
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

f15dfc61

infect: Move breakpoints management into infect · c954ac16

Pavel Emelyanov authored Oct 27, 2016

This removes restorer.h from infect. The header describes
routines, structures and constants messing with restorer blob.
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

c954ac16

infect: Remove parasite-syscall.h from infect · 6fee9c70

Pavel Emelyanov authored Oct 27, 2016

This is

* Move parasite_setup_regs() and related into arch/infect
* Move arch_can_dump_task() into infect
* Move parasite_send_fd() into infect-util

and completes parasite-syscall.h removal.
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

6fee9c70

infect: Move thread_ctx structure into infect · 5156b096

Pavel Emelyanov authored Oct 27, 2016

For now it's becoming the part of the compel API and lets
us remove parasite-syscall.h from infect.c. The former header
includes declarations of CRIU dumping routines that work with
parasite code.
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

5156b096

infect: Move ptrace_get/set_regs() into ptrace.c · cd368c8e

Pavel Emelyanov authored Oct 27, 2016

The criu/ptrace.c will also go into compel sources, so
detach the needed code from CRIU as well.
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

cd368c8e

infect: Remove parasite.h from infect.c · 3e2f8957

Pavel Emelyanov authored Oct 27, 2016

This header describes CRIU parasite code, it has nothing
to do with infect, so remove it.

To do this we need to:

* Detach infect RPC commands from criu-parasite ones
* Move parasite_init_args and parasite_unmap_args into infect
* Move PARASITE_AREA_MIN into infect
* Hiding PARASITE_STACK_SIZE-s in infect
* Hiding parasite symbols resolvers in infect
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

3e2f8957

infect: Move ksigset helpers into compel · 2abf96bb

Pavel Emelyanov authored Oct 27, 2016

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

2abf96bb

compel: Create symlink into arch dir inside uapi headers · 432351d6

Cyrill Gorcunov authored Oct 26, 2016

To be able to include compel/asm/ headers when needed.
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

432351d6

infect: Remove infect-priv.h from arch/crtools.c · df217daa

Pavel Emelyanov authored Oct 19, 2016

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

df217daa

infect: Move mmap_seized() and syscall_seized() into arch/infect.c · 62e1ba93
Pavel Emelyanov authored Oct 19, 2016
```
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
```
62e1ba93

infect: Move get_task_regs-s into arch/infect.c · 3b8dcf02

Pavel Emelyanov authored Oct 19, 2016

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

3b8dcf02

infect: Introduce arch part · 590856f5

Pavel Emelyanov authored Oct 19, 2016

Same split as was previously done with parasite-syscall.c now
with arch/*/crtools.c files.
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

590856f5

infect: Introduce API to configure the infection · f98a5575

Pavel Emelyanov authored Sep 30, 2016

I.e. -- the infect_ctX structure. Now it's in infect.h and
is aimed for compel sources.
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

f98a5575

infect: Move sigmask getter (from ctl) into infec.c · 5e75d499

Pavel Emelyanov authored Sep 30, 2016

... and hide compel priv from parasite-syscall.
Now it's completely isolated inside compel.
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

5e75d499

infect: Move seized_native() into infect.c · 329d2c15

Pavel Emelyanov authored Sep 30, 2016

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

329d2c15

infect: Move parasite RPC code into infect-rpc.c · 795049e6

Pavel Emelyanov authored Sep 30, 2016

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

795049e6

infect: Move pie tracing code into infect.c · 315b0d82

Pavel Emelyanov authored Sep 29, 2016

Note -- presumably it's another functionality block inside compel,
so another .c file might be tempting here.
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

315b0d82

infect: Move unseize_task() into infect.c · 18248ce4

Pavel Emelyanov authored Sep 29, 2016

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

18248ce4

infect: Move parasite_map_exchange() into infect.c · 754a2d95

Pavel Emelyanov authored Sep 29, 2016

Note -- this will go away from compel API with cr-exec.c
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

754a2d95

infect: Move restore_thread_ctx() into infect.c · b071c6e3

Pavel Emelyanov authored Sep 28, 2016

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

b071c6e3

infect: Move parasite_trap() into infect.c · 511a6ffd

Pavel Emelyanov authored Sep 28, 2016

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

511a6ffd

infect: Move parasite_unmap() into infect.c · 34db99e3

Pavel Emelyanov authored Sep 28, 2016

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

34db99e3

infect: Move parasite_run_in_thread() into infect.c · 6a4279dd

Pavel Emelyanov authored Sep 28, 2016

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

6a4279dd

infect: Move parasite_execute_syscall() into infect.c · 93d6aeb8

Pavel Emelyanov authored Sep 28, 2016

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

93d6aeb8

infect: Move parasite_args* into infect.c · d4b415eb

Pavel Emelyanov authored Sep 28, 2016

This is the code that lets caller place arguments into memory
shared between parasite and compel (or caller).
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

d4b415eb

infect: Move parasite_stop_daemon and parasite_cure_* into infect.c · 3a53b589
Pavel Emelyanov authored Sep 28, 2016
```
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
```
3a53b589

infect: Move parasite_prep_ctl into infect.c · e156ab5a

Pavel Emelyanov authored Sep 28, 2016

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

e156ab5a

infect: Move infect() into infect.c · bb33a774

Pavel Emelyanov authored Sep 28, 2016

Not only infect() routine but all dependant code too. This is
the core of the library actually.
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

bb33a774

infect: Make parasite_ctl private · 27243759

Pavel Emelyanov authored Sep 28, 2016

This structure will be internal to compel. Users will only see
one as opaque pointer and read data from it using calls.

Exception for now -- infect_ictx. This is a configuration structure
that will be embeded into ctl and seen outside.
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

27243759

infect: Move seize_wait_task -> compel_wait_task · 7d3e7b05

Pavel Emelyanov authored Sep 27, 2016

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

7d3e7b05

infect: Move seize_catch_task -> compel_stop_task · ea470224

Pavel Emelyanov authored Sep 27, 2016

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

ea470224

infect: Introduce skeleton for soon-to-be compel code · 6dc2e2de

Pavel Emelyanov authored Sep 27, 2016

We'll collect the compel code here and will move all these
files into compel library by the last patch of this set.
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

6dc2e2de

infect: The big split of infection routine · 1fe80294

Pavel Emelyanov authored Sep 26, 2016

Now we can split the parasite_infect_seized() into CRIU-specific
part and independent part that is to become compel code.

The API to infect() is for now a bit clumsy, but I will rectify one
a bit more in the next patches.
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

1fe80294

infect: Keep entry point for first syscall on ictx · 2c76fc8a

Pavel Emelyanov authored Sep 27, 2016

This is the address of an executable VMA. To get one
we need to parse /proc/pid/maps, compel will do it, but
since criu already parses this file (to dump task vmas),
we can provide the address via ictx.
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

2c76fc8a

infect: Add registers keeping on infect_ctx · c0e468dd

Pavel Emelyanov authored Sep 26, 2016

Two calls -- to keep the registers and to put them back onto
sigframe. For CRIU the keeping is performed on CoreEntry.
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

c0e468dd

infect: Place sigchild handler on ictx · 3569b51e

Pavel Emelyanov authored Sep 28, 2016

To track victim health state criu sets up the sigchild handler.
So will have to do the compel, but the ability to request for
own handler would be required.
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

3569b51e

infect: Introduce flags on ictx · 77455014

Pavel Emelyanov authored Sep 28, 2016

These will control various behavior of infection engine. For now
only fault-injections.
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

77455014