Commits · 5975c94e3c9629e59072e2e209f80353e3c6fd44 · zhul / criu

23 Apr, 2014 4 commits

zdtm: Add testing of irmap cache generation · 5975c94e
Pavel Emelyanov authored Apr 23, 2014
```
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
```
5975c94e

ns: initialize nsid in rst_add_ns_id · a20011ac

Andrey Vagin authored Apr 23, 2014

Execute zdtm/live/static/pipe00
./pipe00 --pidfile=pipe00.pid --outfile=pipe00.out
Dump 3158
Restore
test/zdtm.sh: line 472:  3173 Segmentation fault      (core dumped) setsid  restore --file-locks --tcp-established -x -D  -o

Reported-by: Jenkins Criuovich
Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

a20011ac

mnt: Factor out mntns nsid creation on restore · 8d5822d9
Pavel Emelyanov authored Apr 23, 2014
```
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
```
8d5822d9
mnt: Add comment why we need criu's mntns mounts for dump · aca33ac4
Pavel Emelyanov authored Apr 23, 2014
```
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
```
aca33ac4

22 Apr, 2014 30 commits

files: Check for for mount to exist only once · f22591c9

Pavel Emelyanov authored Apr 22, 2014

The nsid lookup will search for mount in case mnt_id
is given. No need to do it twice (the 2nd time for
sanity check).
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

f22591c9

unix: Get ns root fd only once. · 74357818

Pavel Emelyanov authored Apr 22, 2014

This makes mntns_get_root_fd usage more natural.
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

74357818

mnt: Add comments on tricky places · 8ef1d378
Pavel Emelyanov authored Apr 22, 2014
```
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
```
8ef1d378
mnt: Sanitize prepare_mnt_ns nsids loop · 3d11c6c0
Pavel Emelyanov authored Apr 22, 2014
```
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
```
3d11c6c0

mnt: Turn mntns_get_root_fd into accepting mnt ns_id · 68e2841a

Pavel Emelyanov authored Apr 22, 2014

The only exception (for now) is the irmap -- it should
operate on ns as well.
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

68e2841a

remap: Keep nsid on remap rollback, not the ns' pid · 1c4f8fdc

Pavel Emelyanov authored Apr 22, 2014

This is more logical -- we should remap file in namespace,
not in pid. Also this would help to clean the code further.
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

1c4f8fdc

Revert "mnt: Merge two calls to collect_mntinfo on early restore" · d5e6a51b

Pavel Emelyanov authored Apr 22, 2014

This reverts commit f55a0b91.

The collected mounts list a) points to nsid and b) should be
put on nsid's mntinfo_tree. Thus is _should_ be done by separate
calls.

d5e6a51b

mnt: Rename _collect_root into _get_root_fd · 1435617c

Pavel Emelyanov authored Apr 22, 2014

Nowadays this routine is mainly used for getting an
fd, rather than keeping one for future reference.
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

1435617c

mount: remove extra calls of mntns_collect_root() · 20003300

Andrey Vagin authored Apr 22, 2014

Now mntns_collect_root() should be called each time when we need to get
a root of a specified namespace and we don't need to call it for
initializing the global variable.
Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

20003300

rst: Don't lookup ns if current mntns is the same as root's one · 4ec63d53
Pavel Emelyanov authored Apr 22, 2014
```
Acked-by: Andrew Vagin <avagin@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
```
4ec63d53

rst: Less arguments to restore_task_mnt_ns · 79f3e908

Pavel Emelyanov authored Apr 22, 2014

Acked-by: Andrew Vagin <avagin@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

79f3e908

rst: Don't forget to close nsfd after setns · 8472345d

Pavel Emelyanov authored Apr 22, 2014

Acked-by: Andrew Vagin <avagin@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

8472345d

mnt: Merge two calls to collect_mntinfo on early restore · f55a0b91
Pavel Emelyanov authored Apr 22, 2014
```
Acked-by: Andrew Vagin <avagin@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
```
f55a0b91
mnt: Move local mntns collecting on restore into prepare_mnt_ns · 8550f520
Pavel Emelyanov authored Apr 22, 2014
```
Acked-by: Andrew Vagin <avagin@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
```
8550f520

mnt: Move nsmask checking into prepare_mnt_ns · 05c02ddc

Pavel Emelyanov authored Apr 22, 2014

Helper for simpler next patch.
Acked-by: Andrew Vagin <avagin@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

05c02ddc

mnt: Sanitize collect mntinfo error path · 90891588

Pavel Emelyanov authored Apr 22, 2014

Acked-by: Andrew Vagin <avagin@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

90891588

mnt: Mark fini_mnt_ns as void arg · f818065e

Pavel Emelyanov authored Apr 22, 2014

Acked-by: Andrew Vagin <avagin@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

f818065e

mnt: Helper for getting mntns root path · 02f7c5c6

Pavel Emelyanov authored Apr 22, 2014

Acked-by: Andrew Vagin <avagin@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

02f7c5c6

mnt: Mark create_mnt_roots as void arg · 169dada8

Pavel Emelyanov authored Apr 22, 2014

Acked-by: Andrew Vagin <avagin@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

169dada8

mnt: Mark rst_collect_local_mntns as void · f4b7a6fe

Pavel Emelyanov authored Apr 22, 2014

Acked-by: Andrew Vagin <avagin@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

f4b7a6fe

mnt: Merge mnt nss dumping and collecting code · b08af3a9

Pavel Emelyanov authored Apr 22, 2014

Acked-by: Andrew Vagin <avagin@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

b08af3a9

mnt: Move collect and list of pms out of ns dumping routine · 33b7ec50

Pavel Emelyanov authored Apr 22, 2014

This is a helper for the next patch.
Acked-by: Andrew Vagin <avagin@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

33b7ec50

mnt: Mark dump_mnt_ns as static · 88eef43e

Pavel Emelyanov authored Apr 22, 2014

Acked-by: Andrew Vagin <avagin@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

88eef43e

mnt: Check for ns being mnt before dumping · f60109f2

Pavel Emelyanov authored Apr 22, 2014

Acked-by: Andrew Vagin <avagin@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

f60109f2

mnt: Sanitize the code of reading mnt images routine · d49fd40e
Pavel Emelyanov authored Apr 22, 2014
```
Acked-by: Andrew Vagin <avagin@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
```
d49fd40e

mnt: Remove unneeded argument from prepare_mnt_ns · 4ffa7969

Pavel Emelyanov authored Apr 22, 2014

Acked-by: Andrew Vagin <avagin@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

4ffa7969

mnt: Fix void argument for reading mnt images helper · bc312d32
Pavel Emelyanov authored Apr 22, 2014
```
Acked-by: Andrew Vagin <avagin@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
```
bc312d32
mnt: Helper for adding new set of mountpoints into global list · dd43b3c5
Pavel Emelyanov authored Apr 22, 2014
```
Acked-by: Andrew Vagin <avagin@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
```
dd43b3c5

collect: Check for ns being mnt before collecting · 1009985e

Pavel Emelyanov authored Apr 22, 2014

Acked-by: Andrew Vagin <avagin@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

1009985e

kcmp: Fix ret code comparison · 443adb5a

Cyrill Gorcunov authored Apr 21, 2014

In the early draft of kcmp syscall it has been returning
[-1|0|1] values but finally [0|1|2] were merged into the
kernel, but I forgot to update the criu code. The good
thing is that because we're using rbtree the kcmp results
are still sorted and tree is balanced but sometime we may
take a wrong branch generating new ID even if the object
is present in the tree which eventually may lead to dump
faulure.
Reported-by: Deyan Doychev <deyan@1h.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Acked-by: Andrew Vagin <avagin@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

443adb5a

21 Apr, 2014 6 commits

mount: prevent dumping nested mount namespace without mnt_id in fdinfo · 85569e8d

Andrey Vagin authored Apr 21, 2014

When we don't know mnt_id, we don't know to which namespace a file
belongs.
Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

85569e8d

check: check the mnt_id field in fdinfo · 8620912d

Andrey Vagin authored Apr 21, 2014

Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

8620912d

zdtm: check opened files in a second mntns · a3ea8102

Andrey Vagin authored Apr 21, 2014

Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

a3ea8102

mount: don't open the same root twise · 37924895

Andrey Vagin authored Apr 21, 2014

Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

37924895

mount: use per-namespace mntinfo_tree (v2) · 2f4be997

Andrey Vagin authored Apr 21, 2014

This patch removes the global mntinfo_tree and collect_mount_info where
it was constructed. The mntinfo list is filled from dump_mnt_ns,
rst_collect_local_mntns, collect_mnt_namespaces and read_mnt_ns_img.

A mountinfo entry contains a reference on a proper ns_id entry, so
we cau use mnt_id to look up a proper mount namespace.

v2: remove trash after rebasing.
Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

2f4be997

restore: set buildinfo_tree for each mount namespace · 03c69251

Andrey Vagin authored Apr 21, 2014

On restore all namespaces are restored as one tree and
a pointer on the root of this tree will be set on each namespace.

Below you can find a call trace, where it's used:
Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

03c69251