- 06 Sep, 2016 18 commits
-
-
Tycho Andersen authored
Initially, the cgroupns patchset that went into the Ubuntu kernels had the nsroot= argument in mountopts, which allowed us to distinguish between cgroupfs mounts. The upstream kernel doesn't have this (the reasoning was that it showed up in the root field of mountinfo), so all cgroup mounts look idential if we don't consider the root mount, and we wrongly detect the mounts as bind mounts. Instead, let's remember the root path and compare this when considering when a mount is a bind mount. This patch is a little ugly because it intorduces cgroup specific behavior into the generic code, which we've thus far been able to avoid. One way to deal with this might be able to add a ->sb_equal hook to the fstype struct that could compare mountinfos' superblocks, and then fall back to mounts_sb_equal if that isn't present. Or we can leave this specific code in the generic bits until more of these appear. Either way is fine with me. v2: move the cgroup specific code to mounts_sb_equal() Signed-off-by:
Tycho Andersen <tycho.andersen@canonical.com> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Pavel Emelyanov authored
Out-of-core rlims and timers existed before 1.3, so people trying to restore from images generated of this old CRIU would have to upgrade. Signed-off-by: -
Pavel Emelyanov authored
This is the option that would enable the deprecated (to be removed) functionality. For convenience it's also possible to set one via the environment. Signed-off-by: -
Pavel Emelyanov authored
When serving out fds in files engine we _may_ goto move_fd_from() call on the recently added service transport fd. Avoid this theoretical situation. Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Pavel Emelyanov authored
The same thing as in e46ba886 exists in pipes, unix sockets and ttys, so let's re-use the service transport fd there as well. Signed-off-by:
-
Tycho Andersen authored
Similar to f444f7fac40, we need to treat memory.oom_control as a "special" property and try not to write its default value, since in the 3.11 kernel it can't be written when memory.use_heirarchy is true, which is the default. CC: Andrei Vagin <avagin@virtuozzo.com> Signed-off-by:
-
Andrei Vagin authored
It's what we have when ReadOnlyDirectories=/ is set for systemd services. Signed-off-by:
-
Andrei Vagin authored
pivot_root requires a place where to move an old root. Currently a temporary directory is created for that, but it doesn't work if the / directory is read-only. Actually we can use any existing directory. In this patch, criu tries to use /tmp and only if it doesn't exist, criu creates a temporary directory. https://bugs.openvz.org/browse/OVZ-6778 v2: don't give a constant string to mkdtemp Signed-off-by:
-
Dmitry Safonov authored
Cc: Andrew Vagin <avagin@virtuozzo.com> Signed-off-by:
Dmitry Safonov <dsafonov@virtuozzo.com> Acked-by:
-
Fyodor Bocharov authored
If we want to dedup anon shared memory we need to call page_in_parent. So we need to make it extern. Also in case of anon shared mem we have only 1 bit per page so we have to change page_in_parent signature. Signed-off-by:
Fyodor Bocharov <fbocharov@yandex.ru> Signed-off-by:
Eugene Batalov <eabatalov89@gmail.com> Signed-off-by:
-
Fyodor Bocharov authored
In order to restore deduplicated anonymous shared memory we need to open it's parent pagemap images. Code that opens parent pagemap images already exists for anonymous private memory. All we need to do is to remove couple of checks from existing code. Also we need to rename pid to id because now we can pass either pid or shmid and the actual meaning depends on pr_flags. Signed-off-by:
-
Fyodor Bocharov authored
To dedup anon shared memory we need to know its longest size so we could create page cache of appropriate size when dumping pages. Signed-off-by:
-
Pavel Tikhomirov authored
These are only three left in ipc_kern_table which we haven't checkpointed yet, I'm not sure if somebody really uses them except criu, but to be consistent, beter not to change them while c/r. v3: do one sysctl_op for all xxx_next_id(as sysctl_op is quiet slow) v4: do only one sysctl_op in ipc_sysctl_req v5: do msg*_default only if have /proc/sys/fs/mqueue same as other ones from fs/mqueue Signed-off-by:
Pavel Tikhomirov <ptikhomirov@virtuozzo.com> Signed-off-by:
-
Dmitry Safonov authored
...and fix misprints that weren't caught before. I guess, I never fixed that much (possible) bugs by one commit, heh. Signed-off-by:
-
Dmitry Safonov authored
As on x86 compat/native sigframe differ, I need to generalize/modify sigframe macro helpers having in mind: - SIGFRAME_OFFSET differ between native/compat tasks, so it takes sigframe parameter now, which will be used in following patches (also renamed it in RT_SIGFRAME_OFFSET to complement other macros) - RT_SIGFRAME_FPU is now pointer, because each caller takes result's address with &RT_SIGFRAME_FPU(...) - sigreturn_prep_fpu_frame now takes rt_sigframe parameter, as address of fpu_state pointer on x86 will depend on native/compat frame type, so I check local sigframe's type and count address for rsigframe. (See in the very next commit). Cc: Laurent Dufour <ldufour@linux.vnet.ibm.com> Cc: Christopher Covington <cov@codeaurora.org> Cc: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by:
-
Dmitry Safonov authored
sigreturn_prep_fpu_frame is no-op for arm, but I think it's better to fix it while macro correctly expands in sigframe.c - it may change in some future. Cc: Christopher Covington <cov@codeaurora.org> Cc: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by:
-
Dmitry Safonov authored
For x86 there are different SIGFRAME_OFFSET for native and compatible tasks. In the next patches I will make SIGFRAME_OFFSET(rt_sigframe) macro (depending on rt_sigframe). As RESTORE_STACK_SIGFRAME used only for allocation sizes, I don't want to introduce RESTORE_STACK_SIGFRAME(rt_sigframe) dependency on rt_sigframe type. Let's just use for this porpose max sigframe offset of native/compat tasks. Cc: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by:
-
Kravchenko Dmitrii authored
This patch adds implementation of --leave-stopped option to CRIU restore cmd. If --leave-stopped is passed then each process in ps tree gets SIGSTOP before detaching from it. Signed-off-by:
Kravchenko Dmitrii <equivalence1@gmail.com> Signed-off-by:
-
- 15 Aug, 2016 1 commit
-
-
Pavel Emelyanov authored
Bug-fix mostly release. We've also came very close in -dev branch to having x86 32bit support, so hopefully we'll have it in 2.6/2.7. Lazy restore now in test-able state, but still we want kernel patches to leave maintainer's tree, so we still wait. Signed-off-by:
-
- 11 Aug, 2016 20 commits
-
-
Egor Gorbunov authored
Currently during criu dump we create link remap in the same dir where original file was opened. But that dir may not exist during link remap creation. At the same time it's okay to create link remap in any dir on the same mount point. In this patch we do this. We check existance of every dir bottom up through the original file path. We use the first existing dir. Similar approach is used on criu restore during ghost file creation. Signed-off-by:
Egor Gorbunov <egor-mailbox@ya.ru> Signed-off-by:
-
Andrew Vagin authored
Cc: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com> Test-for: b67d37d96fa0 ("proc_parse: fix vma file open mode recognition") Signed-off-by: -
Dmitry Safonov authored
The problem: $(DEFINES) array added to $(CFLAGS) in a global Makefile. But, in criu/Makefile we include Makefile.config, which adds feature-based config options to $(DEFINES). We need to propagate this new defines again to CFLAGS array. Previously, I added: ccflags-y += $(DEFINES) to Makefile.crtools, but those $(DEFINES) are useful not only in the crtools makefile. Let's just propagate this feature defines to CFLAGS and DEFINES in place. Cc: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by:
Cyrill Gorcunov <gorcunov@openvz.org> Acked-by:
-
Dmitry Safonov authored
Adjust all calls to try-cc to compare with 'true' instead of 'y', drop additional rule check-build-packages, as we can check them in the rule now. Cc: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by:
-
Dmitry Safonov authored
- simplify: don't use temporary file -- use /dev/null instead - return 'true' or 'false' -- this way we can use it inside rules without external call to bash to compare return with 'y', see the next patch for a use case. Cc: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by:
-
Fyodor Bocharov authored
'longest' field in vma_area_list struct stores longest private vma size. It is better to name it priv_longest as it is done for priv_size field. Signed-off-by:
-
Mike Rapoport authored
Signed-off-by:
Mike Rapoport <rppt@linux.vnet.ibm.com> Signed-off-by:
-
Andrew Vagin authored
Give a fake address for a server socket. Signed-off-by:
-
Stanislav Kinsburskiy authored
There can be autofs direct mount point without target mount on top. In this case there won't be any bindmount and nothing to restore on top of the autofs mount point. Signed-off-by:
Stanislav Kinsburskiy <skinsbursky@virtuozzo.com> Signed-off-by:
-
Andrew Vagin authored
CID 164719 (#1 of 1): Resource leak (RESOURCE_LEAK) 7. leaked_handle: Handle variable sk going out of scope leaks the handle. Signed-off-by:
-
Stanislav Kinsburskiy authored
Instead of calling it in fill_fd_params_special (which is called for any found path). This reduces amount of system calls on dump. Signed-off-by:
-
Kir Kolyshkin authored
comand -> command Signed-off-by:
Kir Kolyshkin <kir@openvz.org> Signed-off-by:
-
Kir Kolyshkin authored
presense -> presence Signed-off-by:
-
Kir Kolyshkin authored
In comments: cant -> can't irrelevent -> irrelevant sucess -> success prepartion -> preparation recepient -> recipient lenght -> length hexidecimal -> hexadecimal becuase -> because responce -> response controll -> control existance -> existence alltogether -> altogether comparision -> comparison immediatly -> immediately happenned -> happened allready -> already simplier -> simpler succesfully -> successfully absense -> absence In debug messages: Transfering -> Transferring In error messages: reponse -> response Signed-off-by:
-
Kir Kolyshkin authored
Initilize -> Initialize immediatelly -> immediately carefull -> carefully transfering -> transferring descriptrs -> descriptors transfered -> transferred comparision -> comparison Signed-off-by:
-
Kir Kolyshkin authored
comming -> coming puting -> putting Signed-off-by:
-
Kir Kolyshkin authored
Signed-off-by:
-
Kir Kolyshkin authored
Signed-off-by:
-
Kir Kolyshkin authored
Signed-off-by:
-
Kir Kolyshkin authored
Two fixes (reported by coverity) and a minor nitpick: 1. Fix checking error from open_proc(). 2. Fix buffer overflow. MAX_ULONG can be 20 characters long, so ret = read() can return 20 and buf[ret] = 0 will overrun the buf. Make a buf one character longer (an extra byte for \0) and pass sizeof(buf) - 1 to read to fix it. 3. Call close() right after read(). This is a fixup to commit e68bded. Reported by Coverity, CID 168505, 168504. Cc: Laurent Dufour <ldufour@linux.vnet.ibm.com> Signed-off-by:
-
- 08 Aug, 2016 1 commit
-
-
Cyrill Gorcunov authored
Currently, when we use cgroup freezer to seize the tasks we start freezer and then without waiting the completion of transition procedure we are seizing tasks read from freezer @tasks file, using fgets. This is fragile construction because fgets uses internal buffer and tasks we've read might be exiting same time while we're freezing them, the kernel won't freeze these exiting tasks because they are dying anyway and I fear we might read a pid here which is not even in our cgroup anymore but reused with another out of cgroup task. Thus lets do the following: use iterations to freeze tasks waiting for freezer to change its state and then collect/seize all tasks in one pass. For example on container I'm playing with it takes just one iteration | (00.013690) cg: Set 1 is criu one | (00.013705) freezing processes: 1800000 attempst with 100 ms steps | (00.013720) freezer.state=THAWED | (00.013795) freezer.state=FREEZING | (00.113962) freezer.state=FROZEN | (00.113990) freezing processes: 1 attempts done | (00.114073) SEIZE 240893 (comm systemd): success | (00.114110) Warn (ptrace.c:121): Unable to interrupt task: 240905 (comm kthreadd/1) (Operation not permitted) | (00.114136) Warn (ptrace.c:121): Unable to interrupt task: 240906 (comm khelper) (Operation not permitted) | (00.114155) SEIZE 240969 (comm screen): success | (00.114166) SEIZE 240970 (comm sendmail): success | (00.114179) SEIZE 240971 (comm sendmail): success | (00.114189) SEIZE 240972 (comm saslauthd): success | (00.114202) SEIZE 240973 (comm crond): success | (00.114211) SEIZE 240974 (comm agetty): success | (00.114221) SEIZE 240975 (comm agetty): success | ... Signed-off-by:
Cyrill Gorcunov <gorcunov@virtuozzo.com> Acked-by:
Andrew Vagin <avagin@gmail.com> Signed-off-by:
-
