- 29 Feb, 2016 11 commits
-
-
Andrey Vagin authored
$ echo test//home/avagin/git/criu test//home/avagin/git/criu v2: use double quotes to run pwd Signed-off-by:
Andrey Vagin <avagin@openvz.org> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Tycho Andersen authored
Consider the case where --freeze-cgroup=/lxc/foo, but (e.g. with systemd in lxc), all of the tasks actually live in a set of sub cgroups, e.g. /lxc/foo/init.scope and others. In this case, we will have a multi-headed controller, since there is nothing in the common parent. We should just save the freezer value in all of these heads instead of failing. Note that this doesn't address the larger problem that only the top level freezer.state file is c/r'd, or waht happens when the container itself has frozen tasks but not at the top level. After some discussion, there is no nice way to atomically test-and-set the cgroup freezer, so we'll need some other kernel help. But I'll ignore this for now :) Signed-off-by:
Tycho Andersen <tycho.andersen@canonical.com> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Pavel Emelyanov authored
Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Andrew Vagin authored
Signed-off-by:
Andrew Vagin <avagin@virtuozzo.com> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Andrew Vagin authored
Signed-off-by:
Andrew Vagin <avagin@virtuozzo.com> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Andrew Vagin authored
Signed-off-by:
Andrew Vagin <avagin@virtuozzo.com> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Andrew Vagin authored
Signed-off-by:
Andrew Vagin <avagin@virtuozzo.com> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Tycho Andersen authored
As with the socket diag modules, since we might be using the ip*filter_tables modules, we should preload those as well, in case the host system hasn't already loaded them. Really, I should implement netlink buffer dumping so we can get rid of this hack :) v2: remember to close /dev/null fd after using it Signed-off-by:
Tycho Andersen <tycho.andersen@canonical.com> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Cyrill Gorcunov authored
We better should switch to nmk usage. But lets c/p for now. Signed-off-by:
Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Dmitry Safonov authored
Fixes commit e7d89a60 ("add openat() to syscall list"). Nip: move sys_seccomp for numerical order Signed-off-by:
Dmitry Safonov <dsafonov@virtuozzo.com> Acked-by:
Tycho Andersen <tycho.andersen@canonical.com> Reviewed-by:
Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Andrew Vagin authored
We can do this, but we need to be sure that all structures are consistent in any moment and we need to block alarm when they are inconsistent. I don't think that we really want to do this now. I suggest to interrupt a current syscall if an alarm signal is triggered. v2: print an error message before exiting Cc: Andrey Ryabinin <aryabinin@virtuozzo.com> Signed-off-by:
Andrew Vagin <avagin@virtuozzo.com> Reviewed-by:
Andrey Ryabinin <aryabinin@virtuozzo.com> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
- 26 Feb, 2016 11 commits
-
-
Cyrill Gorcunov authored
They are running inside dumpee space so should not be injected with Gcov instructions. Signed-off-by:
Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Cyrill Gorcunov authored
This cause problem on ppc64 | gcc -c -O2 -g -Wall -Werror -DCONFIG_PPC64 -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE | -fno-strict-aliasing -iquote /home/cyrill/criu/criu/include -iquote /home/cyrill/criu/images | -iquote /home/cyrill/criu/criu/pie -iquote /home/cyrill/criu/criu/arch/ppc64 | -iquote /home/cyrill/criu/criu/arch/ppc64/include -iquote /home/cyrill/criu/ -I/usr/include/libnl3 | -iquote ppc64 -DCONFIG_PPC64 -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE parasite-syscall.c -o parasite-syscall.o | parasite-syscall.c: In function ‘parasite_dump_cgroup’: | parasite-syscall.c:1283:2: error: size of unnamed array is negative | ca = parasite_args(ctl, struct parasite_dump_cgroup_args); | ^ | /home/cyrill/criu/scripts/nmk/scripts/rules.mk:53: recipe for target 'parasite-syscall.o' failed Just use size parasite known to support. Signed-off-by:
Cyrill Gorcunov <gorcunov@openvz.org> Acked-by:
Laurent Dufour <ldufour@linux.vnet.ibm.com> Acked-by:
Tycho Andersen <tycho.andersen@canonical.com> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Pavel Emelyanov authored
In commit 736a2940 there was added a collection of non-root task's cgsets. But criu's cgset should anyway be excluded from it. Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Cyrill Gorcunov authored
Signed-off-by:
Cyrill Gorcunov <gorcunov@openvz.org> Acked-by:
Tycho Andersen <tycho.andersen@canonical.com> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Laurent Dufour authored
The tags target should only create tag file using ctags. For those who like to run emacs, the new target etags is generating the TAGS file. Cc: Dmitry Safonov <dsafonov@virtuozzo.com> Cc: Cyrill Gorcunov <gorcunov@openvz.org> Cc: Pavel Emelyanov <xemul@virtuozzo.com> Signed-off-by:
Laurent Dufour <ldufour@linux.vnet.ibm.com> Acked-by:
Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Sergey Bronnikov authored
After refactoring of build system we broke target for code coverage report generation in the main Makefile. This patch fix it. Signed-off-by:
Sergey Bronnikov <sergeyb@openvz.org> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Tycho Andersen authored
Signed-off-by:
Tycho Andersen <tycho.andersen@canonical.com> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Kir Kolyshkin authored
The problem with --no-print-directory set by default is when we run :make from vim and compilation performed by a sub-make fails, vim can't figure out the correct path to a file with error, so instead of jumping to the position of the first error, it opens a new empty file. When make prints "Entering directory ..." and "Leaving directory ..." messages, vim :make works as intended. [Alternatively, we could add -w to $(MAKE) invocations where needed, but the problem is --no-print-directory overrides -w even if -w comes later in the options list, so -w is not working. I was also thinking about detecting whether we are running from vim, but when we'll need to add detection for emacs etc., so let's keep things simple.] Cc: Andrey Vagin <avagin@openvz.org> Cc: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by:
Kir Kolyshkin <kir@openvz.org> Reviewed-by:
Cyrill Gorcunov <gorcunov@openvz.org> Acked-by:
Andrey Vagin <avagin@openvz.org> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Andrey Vagin authored
Signed-off-by:
Andrey Vagin <avagin@openvz.org> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Tycho Andersen authored
I have no idea if this is really the right long term fix, but at least it allows me to build on make 4.1 :) Closes #117 Signed-off-by:
Tycho Andersen <tycho.andersen@canonical.com> CC: Cyrill Gorcunov <gorcunov@openvz.org> Acked-by:
Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Dmitry Safonov authored
In glibc 2.23 PTRACE_{GET,SET}SIGMASK are defined at <ptrace.h>: http://fossies.org/diffs/glibc/2.22_vs_2.23/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h-diff.html Move them under ifdef to fix the following errors: In file included from arch/x86/crtools.c:14:0: ~/tools/criu/criu/include/ptrace.h:47:0: error: "PTRACE_GETSIGMASK" redefined [-Werror] #define PTRACE_GETSIGMASK 0x420a ^ In file included from include/ptrace.h:5:0, from arch/x86/crtools.c:14: /usr/include/sys/ptrace.h:156:0: note: this is the location of the previous definition #define PTRACE_GETSIGMASK PTRACE_GETSIGMASK ^ In file included from arch/x86/crtools.c:14:0: ~/tools/criu/criu/include/ptrace.h:48:0: error: "PTRACE_SETSIGMASK" redefined [-Werror] #define PTRACE_SETSIGMASK 0x420b ^ In file included from include/ptrace.h:5:0, from arch/x86/crtools.c:14: /usr/include/sys/ptrace.h:159:0: note: this is the location of the previous definition #define PTRACE_SETSIGMASK PTRACE_SETSIGMASK ^ cc1: all warnings being treated as errors Fixes #119 Signed-off-by:
Dmitry Safonov <dsafonov@virtuozzo.com> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
- 25 Feb, 2016 1 commit
-
-
Pavel Emelyanov authored
Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
- 24 Feb, 2016 17 commits
-
-
Cyrill Gorcunov authored
Will beautify later -- just explicitly link with syscalls and arch-lib, cause we're switched to phonytargets for deps sake. Signed-off-by:
Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Laurent Dufour authored
Cc: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by:
Laurent Dufour <ldufour@linux.vnet.ibm.com> Acked-by:
Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Kir Kolyshkin authored
With GNU make, using .PHONY leads to the same result as using the "FORCE" hack, but unlike FORCE is not a hack. Since we do not plan to use any other make implementation than GNU make, let's not provide FORCE in nmk. For more details about why PHONY is better than FORCE, see http://www.gnu.org/software/make/manual/make.html#index-FORCESigned-off-by:
Kir Kolyshkin <kir@openvz.org> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Kir Kolyshkin authored
With GNU make, using .PHONY leads to the same result as using the "FORCE" hack, but unlike FORCE is not a hack. Since we do not plan to use any other make than GNU make, let's just mark phony targets as such. For more details about why PHONY is better than FORCE, see http://www.gnu.org/software/make/manual/make.html#index-FORCE [v2: rebased and splitted] Signed-off-by:
Kir Kolyshkin <kir@openvz.org> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Cyrill Gorcunov authored
Signed-off-by:
Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Cyrill Gorcunov authored
Style unification. Signed-off-by:
Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Cyrill Gorcunov authored
Signed-off-by:
Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Andrey Vagin authored
In Ubuntu flock opens a file with O_RDWR and then it can't be executed flock: ./zdtm_mount_cgroups: Text file busy Signed-off-by:
Andrey Vagin <avagin@openvz.org> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Laurent Dufour authored
Signed-off-by:
Laurent Dufour <ldufour@linux.vnet.ibm.com> Acked-by:
Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Laurent Dufour authored
Cc: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by:
Laurent Dufour <ldufour@linux.vnet.ibm.com> Acked-by:
Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Cyrill Gorcunov authored
When link criu we make sure that all underlied systems are up to day: images, syscalls, pie part. Thus provide own targets for them and link on a final pass. This should fix the problem when some file in images|syscalls|pie are changed but criu itself is not rebuilt and relinked. NB: Need to revisit the config/version/feature-test generations too. Signed-off-by:
Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Cyrill Gorcunov authored
Otherwise our feature testing engine will simply fail due to lack of libs we're binding with. Reported-by:
Laurent Dufour <ldufour@linux.vnet.ibm.com> Signed-off-by:
Cyrill Gorcunov <gorcunov@openvz.org> Tested-by:
Laurent Dufour <ldufour@linux.vnet.ibm.com> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Cyrill Gorcunov authored
Everytime we build the executable we've to check all the deps and sources for changes, thus don't protvide criu/criu on toplevel as a target file (my bug in 496b51b6). Instead bring this target as a phony back but drop phony from criu/Makefile itself, as it should be from the beginning. Same time remove unneeded phonies over the targets which are real files. Signed-off-by:
Cyrill Gorcunov <gorcunov@openvz.org> Tested-by:
Tycho Andersen <tycho.andersen@canonical.com> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Laurent Dufour authored
The nmk framework now references PowerPC 64 bits architectures as ppc64. This applies for both little endian, and the future supported big endian one. Acked-by:
Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by:
Laurent Dufour <ldufour@linux.vnet.ibm.com> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Laurent Dufour authored
This is usual to reference PowerPC 64 bits architectures as 'ppc64', and let 'powerpc' define PowerPC 32 bits ones. Acked-by:
Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by:
Laurent Dufour <ldufour@linux.vnet.ibm.com> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Kir Kolyshkin authored
This is handy whenever we want to print size_t or ssize_t. Signed-off-by:
Kir Kolyshkin <kir@openvz.org> Acked-by:
Tycho Andersen <tycho.andersen@canonical.com> Acked-by:
Andrew Vagin <avagin@virtuozzo.com> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Pavel Emelyanov authored
Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-