- 06 Sep, 2016 5 commits
-
-
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 <dsafonov@virtuozzo.com> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
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:
Eugene Batalov <eabatalov89@gmail.com> Acked-by:
Andrew Vagin <avagin@virtuozzo.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:
Fyodor Bocharov <fbocharov@yandex.ru> 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 11 commits
-
-
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:
-
Cyrill Gorcunov authored
When we're freezing processes we don't count on anything but rather do 5 attempts with constantly increasing delay. Lets rather do the following: - take --timeout option into account (which is 5 seconds by default) and split it into 100 ms steps; - when frezing processes check freezer status every 100 ms. Same time it looks that 5 seconds by default is too small for high loaded containers. Lets increase it to 10 seconds by default. [ skinsbursky@: Frankly speaking, in this particular case increasing intervals are not nice. This is not a network issue or something. Usually freezing takes less than a second, but more, that, say 200ms. Otherwise it takes quite o lot of time. If step size is growing all the time, in most of the cases criu will waste hundreds of milliseconds between iterX (say, third) and (iterX+1) because of the growing step size. 100ms step looks solid enough: not to small to produce a lot of syscalls and not to large to waste a lot of time. With previous scheme freezing was usually taking half a second more that it should because of this growing step. [ gorcunov@: You won't belive, but been able to sepcify --timeout 0 here allowed me and Stas to catch serieous problem in freezer code. https://lkml.org/lkml/2016/8/3/317 Without this feature we would have to patch criu instead. So you know, this would be great to keep it for catching more kernel bugs ;) Reported-by:
-
Cyrill Gorcunov authored
For debug sake. Signed-off-by:
-
Andrew Vagin authored
This is an unix dgram socket which doesn't have an address and isn't connected to somewhere, so we can use one socket for all processes. v2: return non-zero code in error cases Signed-off-by:
-
Stanislav Kinsburskiy authored
These files have to be removed after successful restore. v2: Check link remap files only for tests with "--link-remap" option in descriptor. Signed-off-by:
-
Andrew Vagin authored
It should be faster and we don't need to parse a string. Signed-off-by:
-
Andrew Vagin authored
Currently if socket() or connect() syscall-s failed, parasite cures itself, but criu has not got any signals and waits on accept(). This patch adds a futex to synchronize parasite and criu. The server socket is created with SOCK_NONBLOCK and waits on the futex when a parasite connects to it, only then criu calls accept() and it returns immediately. Reported-by:
Yohei Kamitsukasa <uhoidx@gmail.com> Cc: Yohei Kamitsukasa <uhoidx@gmail.com> Signed-off-by:
-
Andrew Vagin authored
We found that sometimes a restored tcp socket doesn't work. A reason of this bug is incorrect window parameters and in this case tcp_acceptable_seq() returns tcp_wnd_end(tp) instead of tp->snd_nxt. The other side drops packets with this seq, because seq is less than tp->rcv_nxt ( tcp_sequence() ). We need to restore window parameters to avoid such side effects. https://github.com/xemul/criu/issues/168Signed-off-by:
-
Andrew Vagin authored
It's a new option to get/set window parameters. v2: don't do this check to unprivileged users, because TCP_REPAIR is protected by CAP_NET_ADMIN. Signed-off-by: -
Katerina Koukiou authored
When using --root option in criu dump, when the mountpoint passed contains a symbolic link, criu does not resolve its parent correctly. e.g when passing --root /run/rootfs, dump finishes successfully; but when /var/run/rootfs is passed, where /var/run is symbolic link to /run it exits with error "New root and old root are the same". Signed-off-by:
Katerina Koukiou <k.koukiou@gmail.com> Signed-off-by:
-
Kirill Tkhai authored
realloc() may move a memory chunk in case of shrink. v4: New Signed-off-by:
Kirill Tkhai <ktkhai@virtuozzo.com> Signed-off-by:
-
- 05 Aug, 2016 1 commit
-
-
Pavel Emelyanov authored
They are only available on dev branch Signed-off-by:
-
- 02 Aug, 2016 1 commit
-
-
Dmitry Safonov authored
For `criu exec` we are searching for a place for syscall injection. While searching for a VMA with PROT_EXEC and with needed size, we check that VMA is lower than task_size. The callpath for it is: cr_exec => parasite_prep_ctl => get_vma_by_ip Firstly, I thought to omit kdat.task_size checking if it's not inited: > if (vma_area->e->start >= kdat.task_size && kdat.task_size) but I think it's a hack then a proper solution. Besides, this code still can choose VMA over task_size on ARM and try to inject syscall there (IIRC, ARM has kernel-mapped VMA in that area). So, lets init kdat.task_size for `criu exec`. Also lets init kdat.has_compat_sigreturn so we could exec into compatible applications. Cc: Christopher Covington <cov@codeaurora.org> Cc: Andrew Vagin <avagin@virtuozzo.com> Cc: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by:
Christopher Covington <cov@codeaurora.org> Signed-off-by:
-
- 01 Aug, 2016 1 commit
-
-
Dmitry Safonov authored
So, how it was working: 1. build-as was declared with $$(1) and $$(2) which were expanded on entering the submake; 2. function $(call build-as,...) performed the second expansion of build-as. Cons: build-as works only in sub-makefile, no sub-sub-makefile, no upper/top makefile. Simplify this by single $(1). Then build-as variable will be used _only_ in makefile, not in sub-makefiles. This is for now fine, as each file, that calls $(MAKE) with $(build)=dir or $(call build-as,makefile,dir) will include main.mk from NMK, which has build-as definition (from include.mk). In the future, we'll get rid of $(build) and $(build-as) workarounds as finally switch to building from a global makefile. Cc: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by:
-
