- 14 Apr, 2015 9 commits
-
-
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:
Oleg Nesterov <oleg@redhat.com> Acked-by:
Tycho Andersen <tycho.andersen@canonical.com> Signed-off-by:
Pavel Emelyanov <xemul@parallels.com>
-
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:
Christopher Covington <cov@codeaurora.org> Signed-off-by:
-
Ruslan Kuprieiev authored
Signed-off-by:
Ruslan Kuprieiev <rkuprieiev@cloudlinux.com> 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:
Andrew Vagin <avagin@odin.com> Acked-by:
Cyrill Gorcunov <gorcunov@openvz.org>
-
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 17 commits
-
-
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: -
Pavel Emelyanov authored
It mostly reuses the infrastructure for plugin testing. Signed-off-by: -
Pavel Emelyanov authored
The existing set of shell scripts do hard-to-debug things and mess with the root filesystem. We can make it better. First, not to play with the system / the process that will be run in a new mount namespace is statically compiled .c file. And this "init" does a very simple thing -- waits for SIGTERM and check that the given filepath contains the given string. Second, the namespace's root will be some subdir, instead of system / bind-mount-ed into a subdir. This makes it easier to keep things together and makes 100% sure the external bind mount cannot be accessed by custom path. Signed-off-by: -
Tycho Andersen authored
Signed-off-by:
-
Tycho Andersen authored
Signed-off-by:
-
Tycho Andersen authored
This option enables external (slave) bind mounts to be resolved. v2: don't always assume that when the master id matches, the mounts match Signed-off-by:
-
Tycho Andersen authored
With this flag, external shared bind mounts are attempted to be resolved automatically. v2: don't always assume when the sharing matches that the mount matches Signed-off-by:
-
Tycho Andersen authored
When this option is specified, if an external (private) bind mount is not specified by --ext-mount-map KEY:VAL then it is attempted to be resolved automatically. v2: introduce find_best_external_match, which looks for the best match based on sharing/slave ids; don't try to resolve fsroot_mounted() mountpoints v3: get rid of really_collect_self_mounts v4: get rid of fsroot_mounted() check when autodetecting external mounts Signed-off-by: -
Oleg Nesterov authored
Finally add --enable-fs option to specify the comma separated list of filesystem names which should be treated as FSTYPE_AUTO. Note: obviously this option is not safe, use at your own risk. "dump" will always succeed if the mntpoint is auto, but "restore" can fail or do something wrong if mount(src, mountpoint, flags, options) can not actually "just work" as FSTYPE_AUTO logic expects. Signed-off-by:
-
Oleg Nesterov authored
Add the new mnt_entry->fsname member and change dump_one_mountpoint() to save pm->fstype->name if fstype == FSTYPE__AUTO. Change collect_mnt_from_image() to pass this ->fsname to decode_fstype() which falls back to __find_fstype_by_name(fsname, true) if FSTYPE__AUTO. Signed-off-by:
-
Oleg Nesterov authored
Simple preparation to simplify the review of the next patch. Turn find_fstype_by_name(name) into __find_fstype_by_name(name, force_auto) and reimplement find_fstype_by_name() as a trivial wrapper on top. This allows "restore" to specify that this particular fsname was treated as FSTYPE__AUTO by "dump". Signed-off-by:
-
Oleg Nesterov authored
The comment in find_fstype_by_name() says: just mounting anything is wrong and this is true in general, but: almost every fs has its own features this is not true in a sense that a lot of supported filesystems do not need any special processing: FSTYPE__PROC, FSTYPE__SYSFS, and more. More importantly, this logic does not allow to spicify from the command line that (say) currently unsupported hugetlbfs can "just work", do_new_mount() should only pass the right name/options. This patch adds the new FSTYPE__AUTO code, find_fstype_by_name(name) adds the new entry if fsname_is_auto(name) returns true. We do not care that different fstype's can have the same FSTYPE__AUTO code, fstype->code has no meaning unless we need to do something special with this fs, but in this case it should not be FSTYPE__AUTO by definition. Note: currently find_fstype_by_name() just returns true, it is obviously pointless to "dump" until we teach "restore" to handle FSTYPE__AUTO. Signed-off-by:
-
Oleg Nesterov authored
Preparation. Enlarge fstypes[] to make it possible to add the new fstype's dynamically. This means ths find_fstype_by_name() and decode_fstype() need the additional ->name == NULL check to terminate the search. Also change them to start with "i == 1", we rely on the fact that fstypes[0] is FSTYPE__UNSUPPORTED anyway. Signed-off-by:
-
Pavel Emelyanov authored
Signed-off-by: -
Tycho Andersen authored
1. If a fuse connection is present, but there are no fuse mounts of that type in the mount namespace, don't refuse to dump. 2. If there are mounts of that type in the container but they are external, we're going to bind them anyway, so there's no fuse-specific things that need to be done, so it is safe to dump. v2: check that the fstype is fuse as well Signed-off-by:
-
Tycho Andersen authored
Signed-off-by:
-
Pavel Tikhomirov authored
we don't need this check as just after it we have: if (ret) break; which safely unpackes nde, and closes nlsk and img in case of error ps: sorry for inconveniences caused by my patchset Signed-off-by:
Pavel Tikhomirov <ptikhomirov@odin.com> Signed-off-by:
-
- 09 Apr, 2015 13 commits
-
-
Pavel Emelyanov authored
Signed-off-by: -
Pavel Emelyanov authored
Signed-off-by: -
Cyrill Gorcunov authored
Somehow _sys_ token sneaked into __NR term. Drop it off to be close to kernel's representation. Signed-off-by:
-
Pavel Tikhomirov authored
check it for default/lo, test values for config options are randomly generated and restricted by rand_limit changes: v2: make for all config options, avoid use of "system". v3: err->fail, run in own set of namespaces, add random, check not all options. v4: use all options because test is run in net-namespace, use ARRAY_SIZE macro v5: check fscanf and snprintf return values properly Signed-off-by:
Pavel Tikhomirov <ptikhomirov@parallels.com> Acked-by:
-
Pavel Tikhomirov authored
because namespace default options are set before devices creation, devices will gain default options(except lo, which is created with ns). Signed-off-by:
-
Pavel Tikhomirov authored
Signed-off-by:
-
Pavel Tikhomirov authored
restore order: 1. default 2. all 3. devices Signed-off-by:
-
Pavel Tikhomirov authored
Signed-off-by:
-
Pavel Tikhomirov authored
Signed-off-by:
-
Pavel Tikhomirov authored
Signed-off-by:
-
Pavel Tikhomirov authored
Signed-off-by:
-
Pavel Emelyanov authored
Signed-off-by: -
Tycho Andersen authored
In the rest of this series we need to walk all the namespaces to autodetect which mounts are master/shared/private bind mounts, so we need the information from criu's namespace in the case when the namespaces are not the same. Signed-off-by:
-
- 07 Apr, 2015 1 commit
-
-
Saied Kazemi authored
Currently if /tmp does not exist, CRIU fails because it will not be able to create a temporary directory there. But when checkpointing and restoring containers, we cannot rely on the existence of /tmp. For such containers, we should use root (/). The temporary directory will be removed after CRIU is done. Signed-off-by:
Saied Kazemi <saied@google.com> Acked-by:
-
