Commits · 565498a7743ba61084a0c93900832f90641c9ba9 · zhul / criu

04 Nov, 2018 9 commits

tests: more python3 compatibility · 565498a7

Adrian Reber authored Oct 29, 2018

This makes two zdtm test scripts python3 compatible to run
zdtm on a system without python2.
Signed-off-by: Adrian Reber <areber@redhat.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>

565498a7

Go-criu clean up · 12fb7f5a

Radostin Stoyanov authored Oct 31, 2018

The Go bindings for CRIU and the P.Haul extension have been moved into
a separate repository.

This patch removes the following from the criu-dev branch:

- lib/go/*
- phaul/*
- scripts/travis/phaul

The removed files are available in

https://github.com/checkpoint-restore/go-criuSigned-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>

12fb7f5a

cgroup: allow to specify a new root for each controller separately · 44a10467

Andrei Vagin authored Oct 29, 2018

A few controllers can be merged and before this patch, criu required to
set a new root by specifying all merged controllers.

This patch allows to specify a new root for each controller separately,
but criu will check that all merged controllers will have the same path.

https://github.com/checkpoint-restore/criu/issues/544Signed-off-by: Andrei Vagin <avagin@gmail.com>

44a10467

test/file_locks: use F_GETLK instead of F_GETLK64 · d01899e1
Andrei Vagin authored Nov 01, 2018
```
F_GETLK64 has to be used with flock64

Reported-by: Mr Jenkins
```
d01899e1

test/file_locks: use struct flock instead of struct flock64 · 54daec18

Andrei Vagin authored Nov 01, 2018

If we want to use flock64, we have to use fcntl64. Otherwise we will get
errors like this:
ERR: file_locks07.c:49: Can't set ofd lock (errno = 22 (Invalid argument))

Reported-by: Mr Jenkins
Signed-off-by: Andrei Vagin <avagin@gmail.com>

54daec18

x86/compat: Remove call32_from_64() helper · e2bd7af9

Dmitry Safonov authored Oct 30, 2018

It looks like, this one is no more needed.
You were a hard child, RIP.
Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>

e2bd7af9

x86/compat: Use do_full_int80() instead of jump to ia32 mode · b0c5881d

Dmitry Safonov authored Oct 30, 2018

Kernel will send signal with ABI of *syscall* that made rt_sigacation().
In sigaction_compat_abi():
>        if (in_ia32_syscall())
>                   act->sa.sa_flags |= SA_IA32_ABI;

So, we can omit switching to ia32 mode and just call int80 like in other places.
We still need 32-bit argument for syscall (sig action pointer).

As call32_from_64() switches mode, it's .text should be placed in lower 4Gb,
which was the reason of segfault if linker places criu code above 4Gb.
Oops, my bad.

Fixes: #567
Reported-by: Andrey Vagin <avagin@gmail.com>
Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>

b0c5881d

restorer: Remember to check ret codes for syscalls · 9ec09471

Dmitry Safonov authored Oct 30, 2018

Looks like, we're missing the check which potentially can add us
some troubles.
Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>

9ec09471

zdtm/x86: Don't override %ebx in fpu00 · 2c5e8fd7

Dmitry Safonov authored Oct 31, 2018

%ebx, %ecx aren't specified as clobbers in chk_proc_fpu(),
while asm cpuid overwrites them.

In the turn, %ebx is used as a code position by gcc now:
    1661:       e8 9a 00 00 00          call   1700 <__x86.get_pc_thunk.bx>
    1666:       81 c3 46 68 00 00       add    $0x6846,%ebx

Which results in dereferencing some ugly garbage (result of cpuid).

Let's use zdtm/lib cpuid() function instead.
Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>

2c5e8fd7

30 Oct, 2018 31 commits

test/file_lock01: don't limit a maximum field width for device numbers · f25f9d57

Andrei Vagin authored Oct 27, 2018

Invalid lock info: lock: 1: FLOCK  ADVISORY  READ  61 103:00:1188168 0 EOF
Signed-off-by: Andrei Vagin <avagin@gmail.com>

f25f9d57

python fix lint warnings · eccdf07a

Andrei Vagin authored Oct 27, 2018

flake8 started to report warnings like this:
test/zdtm.py:1337:6: W605 invalid escape sequence '\S'
Signed-off-by: Andrei Vagin <avagin@gmail.com>

eccdf07a

userns: exit from a child on error paths · ae683919

Andrei Vagin authored Oct 15, 2018

Here is one of popular error, when we call fork, then run a child code
and instead of exiting from a child process, we returns from a current
function with an error code.
Signed-off-by: Andrei Vagin <avagin@gmail.com>

ae683919

test/ipc_namespace: set random values less that IPCMNI for *mni sysctls · de62bf76

Andrei Vagin authored Oct 15, 2018

There are a few patches in linux-next, which added this check:
    ipc: IPCMNI limit check for semmni
    ipc: IPCMNI limit check for msgmni and shmmni
Signed-off-by: Andrei Vagin <avagin@gmail.com>

de62bf76

service: call cr_check() from a child process · c487ad18

Andrei Vagin authored Oct 15, 2018

cr_check() initializes root_item and calls collect_pstree_ids. It was
not designed to be called directly from a service process.
Signed-off-by: Andrei Vagin <avagin@gmail.com>

c487ad18

service: call kerndat_init() before feature check · 87c036be

Andrei Vagin authored Oct 15, 2018

setup_opts_from_req() sets up logging and call kerndat_init().
Investigated-by: Adrian Reber <areber@redhat.com>
Fixes: 6e04f3b2dd06 ("criu: call kerndat_init() after log_init()")
Signed-off-by: Andrei Vagin <avagin@gmail.com>

87c036be

service: use waitpid() when a child pid is known · 8517bc7d

Andrei Vagin authored Oct 15, 2018

We want to wait a specific child. wait() waits any child.
Signed-off-by: Andrei Vagin <avagin@gmail.com>

8517bc7d

zdtm: check criu restore with --auto-dedup · e4d8dc6f

Pavel Tikhomirov authored Sep 28, 2018

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>

e4d8dc6f

image/dedup: use userns_call to be able to open images for write · f84ea82b

Pavel Tikhomirov authored Sep 28, 2018

When restoring a task in it's user namespace we had: "Unable to open
pages-3.img: Permission denied" when trying to open pages images for
write. (Write is needed for memory images deduplication feature to
work.)

These patch makes do_open_image open images fd through usernsd, to have
root permissions.

Also increase MAX_UNSFD_MSG_SIZE as path and metadata don't fit, and
remove a workaround in prepare_vma_ios.
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>

f84ea82b

crit-images: Fix reference to ipc_msg() · 76f8c090

Radostin Stoyanov authored Oct 09, 2018

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>

76f8c090

crit-images: Don't overwrite 'pb' with local var · 3b1563eb

Radostin Stoyanov authored Oct 03, 2018

Rename the local variables 'pb' to 'pbuff' to avoid conflict with the
imported 'pb' module.
Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>

3b1563eb

tty: allocate a separate tty info id for each external tty · ac3296c3

Andrei Vagin authored Sep 27, 2018

Otherwise all external tty-s will share the same tty info,
what is obviously wrong.

v2: allocate a separate tty index range for externl terminals

Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Andrei Vagin <avagin@gmail.com>

ac3296c3

files: save inherited file descriptors in fdstore · 37711ace

Andrei Vagin authored Sep 27, 2018

In this case:
* don't need to care whether they intercept with restored file
  descriptors.
* they don't copied into each restored process
* don't need to close them one by one
Signed-off-by: Andrei Vagin <avagin@gmail.com>

37711ace

zdtm: create a few external descriptros · 89c5fc9b

Andrey Vagin authored Sep 20, 2018

Currently, we create only one external resource to check how it is
handled by criu. It is better to create more than one.
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>

89c5fc9b

test/inhfd: fix lint warnings · a96d2298

Andrey Vagin authored Sep 20, 2018

Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>

a96d2298

lint: check test/inhfd/ scripts · d13ff7e3

Andrey Vagin authored Sep 20, 2018

Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>

d13ff7e3

jenkins: lazy-pages: exclude maps04 · 114af54f

Mike Rapoport authored Oct 02, 2018

On loaded systems running maps04 with lazy-pages takes too much time. The
same functionality is anyway covered by other tests so excluding  maps04
shouldn't decrease the test coverage.
Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>

114af54f

jenkins: split common part of lazy pages tests into a separate file · 3e7cfd11
Mike Rapoport authored Oct 02, 2018
```
Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
```
3e7cfd11
travis: lazy-pages: exclude futex test for older kernels · d9c7787e
Mike Rapoport authored Oct 02, 2018
```
Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
```
d9c7787e

inet: More readable content in show methods · 07e53c77

Cyrill Gorcunov authored Sep 13, 2018

This generates more readable data in logs.

 | (00.002930) inet:       Collected: ino 0xc3f15b family AF_INET    type SOCK_DGRAM     port     8081 state TCP_CLOSE       src_addr 127.0.0.10
 | (00.002980) inet:       Collected: ino 0xc3f159 family AF_INET    type SOCK_RAW       port        1 state TCP_CLOSE       src_addr 127.0.0.14
 | (00.002984) inet:       Collected: ino 0xc3f158 family AF_INET    type SOCK_RAW       port       17 state TCP_CLOSE       src_addr 127.0.0.12
 | (00.002988) inet:       Collected: ino 0xc3f156 family AF_INET    type SOCK_RAW       port      255 state TCP_CLOSE       src_addr 0.0.0.0
 | (00.003439) inet:       Collected: ino 0xc3f15a family AF_INET6   type SOCK_RAW       port       58 state TCP_CLOSE       src_addr ::
 | (00.003449) inet:       Collected: ino 0xc3f157 family AF_INET6   type SOCK_RAW       port      255 state TCP_CLOSE       src_addr ::
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>

07e53c77

sockets: Improve helpers to make sockets more readable · e238854f
Cyrill Gorcunov authored Sep 14, 2018
```
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
```
e238854f

net: Add prefixes for better logging · 18cb72ac

Cyrill Gorcunov authored Sep 13, 2018

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>

18cb72ac

compiler: Add NELEMS_AS_ARRAY helper · a3a42a4c

Cyrill Gorcunov authored Sep 13, 2018

To count elems in accumulator.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>

a3a42a4c

soccr: print errno if connect() failed · 0fb2f0e5

Andrey Vagin authored Sep 20, 2018

https://github.com/checkpoint-restore/criu/issues/557Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
Acked-by: Adrian Reber <areber@redhat.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>

0fb2f0e5

tun: Add support for multiple net ns · 19e9df29

Cyrill Gorcunov authored Sep 21, 2018

The tun files may have same names but different
net namespace so consider ns_id when searching
for particluar tun device name.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>

19e9df29

tun: Set net ns before opening master · 348b2d11

Cyrill Gorcunov authored Sep 21, 2018

Opening tun device is tricky: the net device
is allocated from current net namespace, thus
we should set it first, otherwise all tuns
which live in nested net namespace get moved
to the toplevel one.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>

348b2d11

tun: Define log prefix · 64664bb2

Cyrill Gorcunov authored Sep 21, 2018

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>

64664bb2

python: Replace xrange with range · c36b5dab

Radostin Stoyanov authored Sep 23, 2018

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>

c36b5dab

python: Remove unnecessary semicolons · 7064cbaa

Radostin Stoyanov authored Sep 23, 2018

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>

7064cbaa

Convert to python3 style print() syntax · 147660f0

Radostin Stoyanov authored Sep 23, 2018

Use __future__ imports to keep this working for python2
Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>

147660f0

python: Remove unused imports · 7ce23b2a

Radostin Stoyanov authored Sep 23, 2018

Auto-detected with pylint.
Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>

7ce23b2a