- 22 Apr, 2015 10 commits
-
-
Christopher Covington authored
In AArch64, pages may be 4K or 64K depending on kernel configuration. The GNU C Library documentation suggests [1], "the correct interface to query about the page size is sysconf". Introduce one new architecture-specific function-like macro, page_size(), that on x86 and AArch32 remains a constant so as to minimally affect performance, but on AArch64 is sysconf(_SC_PAGESIZE) for correctness. 1. https://www.gnu.org/software/libc/manual/html_node/Query-Memory-Parameters.html To minimize churn, the PAGE_SIZE macro is left as a build-time estimation of what the run-time page size might be. This fixes the following errors for CRIU on AArch64 kernels with CONFIG_ARM64_64K_PAGES=y, allowing dump of `setsid sleep < /dev/null &> /dev/null` to succeed. Error (kerndat.c:48): Can't stat self map_files: No such file or directory Error (util.c:668): Can't read pme for pid 90: No such file or directory Error (parasite-syscall.c:1135): Can't open 89/map_files/0x3ffb7da0000-0x3ffb7dac000 on procfs: No such file or directory Signed-off-by:
Christopher Covington <cov@codeaurora.org> Acked-by:
Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by:
Pavel Emelyanov <xemul@parallels.com>
-
Andrey Vagin authored
We should not have a chance to exit with a wrong code on error paths. Signed-off-by:
Andrey Vagin <avagin@openvz.org> Signed-off-by:
-
Andrey Vagin authored
We should not have a chance to exit with a wrong code on error paths. Signed-off-by:
-
Andrey Vagin authored
Signed-off-by:
-
Andrey Vagin authored
Signed-off-by:
-
Andrey Vagin authored
We should not have a chance to exit with a wrong code on error paths. |^^^\ | \________________ | ** |_\ \_______/^^^^^^^/_____/ / / / / /____/ Signed-off-by: -
Oleg Nesterov authored
"Unable to look up the %d mount" doesn't really help to understand the problem, add a bit more info. And perhaps it makes more sense to change dump_task_files_seized() to report fd/path if dump_one_file() fails. Signed-off-by:
Oleg Nesterov <oleg@redhat.com> Acked-by:
Tycho Andersen <tycho.andersen@canonical.com> Signed-off-by:
-
Oleg Nesterov authored
selinux can deny mmap(PROT_WRITE | PROT_EXEC) and in this case it is not clear why CRIU fails, "Can't allocate memory for parasite blob" doesn't tell too much. Add a pr_warn() hint for the user. Signed-off-by:
Ruslan Kuprieiev <rkuprieiev@cloudlinux.com> Signed-off-by:
-
Tycho Andersen authored
Signed-off-by:
-
Tycho Andersen authored
On ubuntu (gcc 4.9.2), I get: mount.c: In function ‘add_fsname_auto’: mount.c:1414:3: error: ignoring return value of ‘asprintf’, declared with attribute warn_unused_result [-Werror=unused-result] asprintf(&fsauto_names, "%s,%s", old, names); ^ cc1: all warnings being treated as errors Signed-off-by:
-
- 21 Apr, 2015 10 commits
-
-
Andrey Vagin authored
Now image files contains two magics, so we need to handle both of them. Signed-off-by:
-
Tycho Andersen authored
Note that if the root is unbindable then restore will fail because cr_pivot_root() tries to bind mount the put dir. If this is a case we want to support, we may want to rearrange how this code is called. Signed-off-by:
-
Tycho Andersen authored
The function masks off sharing in the initial setting, but doesn't correctly reset the flags afterwards. CC: Oleg Nesterov <oleg@redhat.com> Signed-off-by:
Andrew Vagin <avagin@odin.com> Looks-good-to: Oleg Nesterov <oleg@redhat.com> Signed-off-by:
-
Oleg Nesterov authored
Change add_fsname_auto() to join multiple --enable-fs options. Note: "all" always wins, and "--enable-fs foo,all,bar" results in fsauto_names = "all" too. Signed-off-by:
-
Oleg Nesterov authored
I am stupid. fsname_is_auto() can't use strtok(), the 2nd call will see zeroes instead of commas in fsauto_names. Add the css_contains() helper and change fsname_is_auto() to use it. Signed-off-by:
-
Pavel Emelyanov authored
Now we have the crit utility to print images' contents in the human-readable format, so show can be thrown out some time soon. For now let's just deprecate it and leave functional only when the output is asked into non-terminal. I.e. the plan shell "criu show -f" will not work. Signed-off-by:
-
Andrey Vagin authored
Currently we use a static buffer, but it is too small. Error (cr-service.c:58): Failed unpacking request: Success Error (cr-service.c:694): Can't recv request: Success data too short after length-prefix of 1217 v2: use recv instead on recvmsg Reported-by:
Ross Boucher <rboucher@gmail.com> Cc: Ross Boucher <rboucher@gmail.com> Signed-off-by:
-
Cyrill Gorcunov authored
Original message from Tycho: This might be a slightly controversial change since it always causes crtools.h to be rebuilt, which may be annoying. However, right now version.h is only generated on the initial git build and never again touched, which is also incorrect. We could potentially do something fancy by monitoring .git/HEAD for changes, but since it may not always exist if building from a tarball, it is a little sticky. CC: Andersen <tycho.andersen@canonical.com> CC: Pavel Emelyanov <xemul@parallels.com> Signed-off-by:
-
Cyrill Gorcunov authored
If symlink is present the test run fails with "already exist" message. Lets make the link unconditional, this is fine. Signed-off-by:
Andrey Vagin <avagin@parallels.com> Signed-off-by:
-
Cyrill Gorcunov authored
Looks like compiler can't encode wide variants of memory copying and uses only xmm registers in 32bit mode. Lets drio i386 from here for a while. Signed-off-by:
-
- 16 Apr, 2015 4 commits
-
-
Tycho Andersen authored
`git describe` outputs slightly more useful git version info: v1.5-132-ga10f39e The motivation for this is that we'd like to begin enforcing criu version in liblxc, but we'd like to enable people to use the git version of 1.6 (since that has stuff like --ext-mount-map auto), which reports its version as 1.5 but doesn't tell us the patchlevel as git describe does. Signed-off-by:
-
Tycho Andersen authored
Andrey reported this issue and it took me a while to figure out exactly what might cause it. I think the comment describes it accurately, as with that example I end up with mountinfo on the host like: 47 23 253:1 /root/bind1/subdir /root/bind2 rw,relatime shared:1 - ext4 /dev/disk/by-uuid/6c5a78e0-95fa-49a8-aa91-a8093d295e58 rw,data=ordered 48 23 253:1 /root/bind1 /root/bind3 rw,relatime shared:1 - ext4 /dev/disk/by-uuid/6c5a78e0-95fa-49a8-aa91-a8093d295e58 rw,data=ordered Reported-by:
-
Tycho Andersen authored
If a mount like: 96 95 0:21 /cgmanager /sys/fs/cgroup/cgmanager rw master:9 - tmpfs tmpfs rw,mode=755 is present in the container and the host has a similar bind mount, e.g. 46 27 0:21 /cgmanager /sys/fs/cgroup/cgmanager rw shared:9 - tmpfs tmpfs rw,mode=755 then the best match mount's root path /and/ the target mountpoint have part of the path in them; we should cut the shared piece of the path and just concatenate the non-duplicate pieces. Reported-by:
-
Tycho Andersen authored
We only malloc() size amount of space, so we shouldn't snprintf past that. Signed-off-by:
-
- 14 Apr, 2015 15 commits
-
-
Pavel Tikhomirov authored
writing to netdev configuration at non zero offset won't be supported: ``` [ 301.431638] netns-dev wrote to accept_local when file position was not 0! This will not be supported in the future. To silence this warning, set kernel.sysctl_writes_strict = -1 ``` v2: fix compilation Sorry, please don't consider v1. Signed-off-by:
Pavel Tikhomirov <ptikhomirov@odin.com> Acked-by:
-
Oleg Nesterov authored
Currently this doesn't matter correctness-wise (with or without the previous changes), but imho collect_mntinfo() needs a cleanup. We should not return with ->mntinfo_list pointing to the freed memory on failure, even if currently this failure is fatal and nobody will ever use this pointer. Signed-off-by:
-
Oleg Nesterov authored
This check was added by commit aebfabb5 "mnt: add --ext-mount-map auto option", but unless I am totally confused it actually belongs to the (already reverted) 246367e4 "add walk_all flag to walk_namespaces". Remove it. It is no longer needed and it was very unobvious. Signed-off-by:
-
Oleg Nesterov authored
We no longer need to populate ext_ns->mnt.mntinfo_list until resolve_external_mounts(). We can rely on find_ext_ns_id() which does collect_mntinfo() on demand. Signed-off-by:
-
Oleg Nesterov authored
Currently we rely on the fact that ->mntinfo_list was already collected by walk_namespaces(walk_all => true), but we are going to change this. This patch simply adds collect_mntinfo(ns) into find_ext_ns_id() if ->mntinfo_list == NULL. This is all we need for this ns_id if it was not initialized by collect_mnt_namespaces(). Signed-off-by:
-
Oleg Nesterov authored
Preparation. Extract the "search the criu's mount info" code from resolve_external_mounts() into the new simple helper, find_ext_ns_id(). Also change resolve_external_mounts() to check ext_ns == NULL rather than !opts.autodetect_ext_mounts. Cosmetic. Signed-off-by:
-
Oleg Nesterov authored
do_new_mount() clears MS_SHARED but this is not enough. It should clear all bits processed in restore_shared_options(). The patch also adds MS_UNBINDABLE to MS_CHANGE_TYPE_MASK even if it is not currently used. Just to match the kernel's do_change_type() check. Signed-off-by:
-
Pavel Emelyanov authored
Only if inventory says it's v1 -- switch to old scheme. Signed-off-by: -
Pavel Emelyanov authored
Doing it at inventory write time is too late. Other than this, inventory isn't created for pre-dump, thus this one always generates v1 images. Signed-off-by: -
Yixun Lan authored
tested under Gentoo Linux, with sys-kernel/linux-headers-3.19 installed "struct user_pt_regs" is defined at file /usr/include/asm/ptrace.h Signed-off-by:
Yixun Lan <yixun.lan@gmail.com> Reviewed-by:
-
Ruslan Kuprieiev authored
Signed-off-by:
-
Pavel Emelyanov authored
These images have common magic in front of per-image one. With this we have 3 "types" of images -- inventory (head), other images, service files. The latter would be stats (not an image, just happen to be in PB format) and irmap cache (not an image again, just auxiliary thing which is in PB for convenience). Since inventory file is the first one we read on restore it's OK to set the global "new images" flag there. Dump (write) is always in new format. Signed-off-by:
-
Pavel Emelyanov authored
Signed-off-by:
-
Oleg Nesterov authored
collect_mnt_namespaces() returns with ret=0 if resolve_external_mounts() fails. Signed-off-by:
-
Oleg Nesterov authored
We can simply overwrite the dot symbol right after the kernel reports it to us. Signed-off-by:
-
- 10 Apr, 2015 1 commit
-
-
Oleg Nesterov authored
resolve_source() insists on kdev_major() == 0, and this makes sense. However, at least FSTYPE__AUTO can try to use mi->source as a block device and pray it will work. [ Also bout this change from Oleg: Let me send another (last) functional change before the promised cleanups we discussed. To remind, without this patch I still can't dump/restore /home and /boot on my testing machine. --enable-fs xfs "works" in a sense that "dump" succeeds. But "restore" fails. However. Lets forget this for the moment. To me resolve_source() looks just wrong. Sure, I agree, it is not safe to blindly use mi->source if kdev_major() != 0. But this means that we should not have dumped this mountpoint, simply because we can't restore it. Yes, currently this works because fstypes[] contains only the diskless filesystems, but still. So this probably needs more cleanups too, and this patch doesn't make this logic look better. To me, we should do something like static char *resolve_source(struct mount_info *mi) { if (kdev_major(mi->s_dev) == 0) /* * Anonymous block device. Kernel creates them for * diskless mounts. */ return mi->source; if (mi->fstype->code != FSTYPE__AUTO) { pr_err("OOPS! something is wrong!!!\n"); return NULL; } // OK, this is FSTYPE__AUTO, it should "just work" // by definition. Or the user should blame himself. struct stat st; if (stat(mi->source, &st) || !S_ISBLK(st.st_mode) || major(st.st_rdev) != kdev_major(mi->s_dev) || minor(st.st_rdev) != kdev_minor(mi->s_dev)) pr_warn("Hmm, can't verify blkdev. Lets see if mount will work...\n"); return mi->source; } But this patch only does a minimal change to make FSTYPE__AUTO work with blkdev. ] Signed-off-by:
-
