xemul / criu / 1221
66%
master: 66%

LAST BUILD BRANCH: criu-dev
DEFAULT BRANCH: master
Ran
Jobs 1
Files 209
Run time 9s
Badge
Embed ▾
README BADGES
x

If you need to use a raster PNG badge, change the '.svg' to '.png' in the link

Markdown

Textile

RDoc

HTML

Rst
1221

push

travis-ci

xemul 
restore: Fix deadlock when helper's child dies

Since commit ced9c529f687 ("restore: fix race with helpers' kids dying
too early"), we block SIGCHLD in helper tasks before CR_STATE_RESTORE.
This way we avoided default criu sighandler as it doesn't expect that
childs may die.

This is very racy as we wait on futex for another stage to be started,
but the next stage may start only when all the tasks complete previous
stage. If some children of helper dies, the helper may already have
blocked SIGCHLD and have started sleeping on the futex. Then the next
stage never comes and no one reads a pending SIGCHLD for helper.

A customer met this situation on the node, where the following
(non-related) problem has occured:
Unable to send a fin packet: libnet_write_raw_ipv6(): -1 bytes written (Network is unreachable)
Then child criu of the helper has exited with error-code and the
lockup has happened.

While we could fix it by aborting futex in the end of
restore_task_with_children() for each (non-root also) tasks,
that would be not completely correct:
1. All futex-waiting tasks will wake up after that and they
   may not expect that some tasks are on the previous stage,
   so they will spam into logs with unrelated errors and may
   also die painfully.
2. Child may die and miss aborting of the futex due to:
   o segfault
   o OOM killer
   o User-sended SIGKILL
   o Other error-path we forgot to cover with abort futex

To fix this deadlock in TASK_HELPER, as suggested-by Kirill,
let's check if there are children deaths expected - if there
isn't any, don't block SIGCHLD, otherwise wait() and check if
death was on expected stage of restore (not CR_STATE_RESTORE).

Reviewed-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

Conflicts:
	criu/cr-restore.c

17996 of 27404 relevant lines covered (65.67%)

58131.4 hits per line

Uncovered Existing Lines

Lines Coverage ∆ File
1
81.08
 18.92% /home/travis/build/xemul/criu/criu/pagemap-cache.c
2
62.5
 -25.0% /usr/include/x86_64-linux-gnu/bits/string3.h
2
92.98
 0.0% /home/travis/build/xemul/criu/criu/aio.c
2
82.61
 -0.3% /home/travis/build/xemul/criu/criu/log.c
3
83.33
 0.0% /home/travis/build/xemul/criu/images/ghost-file.pb-c.c
3
55.56
 -35.35% /usr/include/x86_64-linux-gnu/bits/stdio2.h
3
15.38
 -23.08% /usr/include/x86_64-linux-gnu/bits/fcntl2.h
4
94.12
 0.04% /home/travis/build/xemul/criu/criu/page-pipe.c
5
87.18
 3.85% /home/travis/build/xemul/criu/criu/signalfd.c
5
85.29
 4.21% /home/travis/build/xemul/criu/criu/eventfd.c
5
89.29
 0.82% /home/travis/build/xemul/criu/criu/fifo.c
5
58.33
 -16.67% /home/travis/build/xemul/criu/criu/arch/x86/sigframe.c
6
33.33
 0.0% /home/travis/build/xemul/criu/criu/include/files.h
7
61.11
 0.0% /home/travis/build/xemul/criu/images/fdinfo.pb-c.c
7
80.61
 0.61% /home/travis/build/xemul/criu/criu/sysctl.c
8
16.67
 -14.81% /home/travis/build/xemul/criu/images/packet-sock.pb-c.c
8
16.67
 -44.44% /home/travis/build/xemul/criu/images/signalfd.pb-c.c
8
16.67
 -44.44% /home/travis/build/xemul/criu/images/eventfd.pb-c.c
8
27.78
 -11.11% /home/travis/build/xemul/criu/images/eventpoll.pb-c.c
8
16.67
 -44.44% /home/travis/build/xemul/criu/images/timerfd.pb-c.c
8
31.48
 -7.41% /home/travis/build/xemul/criu/images/tty.pb-c.c
8
16.67
 -22.22% /home/travis/build/xemul/criu/images/tun.pb-c.c
8
16.67
 -22.22% /home/travis/build/xemul/criu/images/sk-unix.pb-c.c
8
16.67
 -44.44% /home/travis/build/xemul/criu/images/sk-netlink.pb-c.c
8
16.67
 -22.22% /home/travis/build/xemul/criu/images/sk-inet.pb-c.c
8
16.67
 -44.44% /home/travis/build/xemul/criu/images/fifo.pb-c.c
8
16.67
 -44.44% /home/travis/build/xemul/criu/images/ns.pb-c.c
8
16.67
 -44.44% /home/travis/build/xemul/criu/images/pipe.pb-c.c
8
16.67
 -44.44% /home/travis/build/xemul/criu/images/regfile.pb-c.c
8
86.21
 -0.79% /home/travis/build/xemul/criu/criu/irmap.c
9
69.72
 -1.24% /home/travis/build/xemul/criu/criu/protobuf.c
10
83.33
 -9.38% /home/travis/build/xemul/criu/criu/rst-malloc.c
11
0.0
 -61.11% /home/travis/build/xemul/criu/images/ext-file.pb-c.c
12
16.67
 -66.67% /home/travis/build/xemul/criu/images/sa.pb-c.c
14
63.93
 55.01% /home/travis/build/xemul/criu/criu/action-scripts.c
15
16.67
 0.0% /home/travis/build/xemul/criu/images/core-x86.pb-c.c
16
16.67
 -14.81% /home/travis/build/xemul/criu/images/fsnotify.pb-c.c
16
80.58
 0.78% /home/travis/build/xemul/criu/criu/sk-netlink.c
17
76.19
 0.0% /home/travis/build/xemul/criu/criu/image.c
17
80.0
 0.21% /home/travis/build/xemul/criu/criu/sk-tcp.c
18
19.44
 -6.48% /home/travis/build/xemul/criu/images/cpuinfo.pb-c.c
18
5.19
 -0.37% /home/travis/build/xemul/criu/images/rpc.pb-c.c
18
85.6
 0.0% /home/travis/build/xemul/criu/criu/pie-util-vdso.c
21
70.73
 -6.8% /home/travis/build/xemul/criu/criu/eventpoll.c
21
67.09
 -4.43% /home/travis/build/xemul/criu/criu/arch/x86/cpu.c
21
72.4
 0.59% /home/travis/build/xemul/criu/criu/tun.c
21
70.59
 2.17% /home/travis/build/xemul/criu/criu/sk-queue.c
28
90.85
 7.87% /home/travis/build/xemul/criu/criu/pagemap.c
29
86.38
 9.63% /home/travis/build/xemul/criu/criu/parasite-syscall.c
29
0.0
 -85.19% /home/travis/build/xemul/criu/criu/files-ext.c
33
83.86
 0.26% /home/travis/build/xemul/criu/criu/sk-packet.c
33
76.25
 0.14% /home/travis/build/xemul/criu/criu/shmem.c
39
79.91
 -3.35% /home/travis/build/xemul/criu/criu/pipes.c
40
87.66
 -0.24% /home/travis/build/xemul/criu/criu/pstree.c
41
90.04
 0.02% /home/travis/build/xemul/criu/criu/mem.c
42
18.31
 3.24% /home/travis/build/xemul/criu/criu/lsm.c
55
38.61
 0.0% /home/travis/build/xemul/criu/criu/filesystems.c
61
78.92
 0.3% /home/travis/build/xemul/criu/criu/sk-inet.c
67
77.6
 2.93% /home/travis/build/xemul/criu/criu/fsnotify.c
73
10.91
 -66.36% /home/travis/build/xemul/criu/criu/plugin.c
78
65.12
 -1.65% /home/travis/build/xemul/criu/soccr/soccr.c
78
76.47
 -0.72% /home/travis/build/xemul/criu/criu/page-xfer.c
91
63.49
 0.0% /home/travis/build/xemul/criu/criu/seize.c
95
58.66
 -0.72% /home/travis/build/xemul/criu/criu/util.c
95
72.6
 -1.28% /home/travis/build/xemul/criu/criu/ipc_ns.c
96
64.87
 -0.87% /home/travis/build/xemul/criu/criu/kerndat.c
103
77.9
 -1.47% /home/travis/build/xemul/criu/criu/net.c
106
51.45
 -1.5% /home/travis/build/xemul/criu/criu/crtools.c
106
42.0
 -17.84% /home/travis/build/xemul/criu/criu/vdso.c
107
61.36
 -24.3% /home/travis/build/xemul/criu/criu/arch/x86/crtools.c
108
78.6
 0.23% /home/travis/build/xemul/criu/criu/files.c
110
78.83
 0.37% /home/travis/build/xemul/criu/criu/sk-unix.c
113
0.0
 0.0% /home/travis/build/xemul/criu/criu/autofs.c
119
84.61
 0.14% /home/travis/build/xemul/criu/criu/cr-dump.c
138
67.2
 0.18% /home/travis/build/xemul/criu/criu/cr-check.c
154
79.73
 -0.13% /home/travis/build/xemul/criu/criu/files-reg.c
165
66.22
 0.36% /home/travis/build/xemul/criu/criu/namespaces.c
199
75.77
 -1.54% /home/travis/build/xemul/criu/criu/tty.c
217
77.88
 -0.46% /home/travis/build/xemul/criu/criu/proc_parse.c
270
25.69
 0.12% /home/travis/build/xemul/criu/criu/cr-service.c
300
74.73
 -0.71% /home/travis/build/xemul/criu/criu/mount.c
362
70.51
 -3.12% /home/travis/build/xemul/criu/criu/cr-restore.c
Jobs
ID Job ID Ran Files Coverage
1 1221.1 (TR_ARCH=local GCOV=1) 209
65.67
 Travis Job 1221.1
Source Files on build 1221
Coverage ∆ File Lines Relevant Covered Missed Hits/Line