- 17 Oct, 2017 24 commits
-
-
Andrei Vagin authored
find: unrecognized: -executable Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Andrei Vagin authored
This job is optional and it don't affect the status of a whole job. Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Andrei Vagin authored
Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Andrei Vagin authored
xenial is LTS and it is more stable and popular. Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Kirill Kolyshkin authored
The x86_64 job is the one we run inside Docker (as opposed to 'local', which runs on the host). Let's update this to use Ubuntu Zesty, and since it has clang-4 (unlike the 'local' one) it makes sense to add a clang build. Signed-off-by:
Kir Kolyshkin <kolyshkin@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Kirill Kolyshkin authored
Also, use more official / better maintained Docker image repo. Signed-off-by:
Kir Kolyshkin <kolyshkin@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Kirill Kolyshkin authored
With clang 4, the following error appears: > CC criu/pie/parasite.o > In file included from criu/pie/parasite.c:23: > criu/arch/arm/include/asm/parasite.h:6:21: error: this function > declaration is not a > prototype [-Werror,-Wstrict-prototypes] > *ptls = ((tls_t (*)())0xffff0fe0)(); > ^ > void > 1 error generated. Apparently, adding void fixes it. Signed-off-by:
Kir Kolyshkin <kolyshkin@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Kirill Kolyshkin authored
Numerous improvement to extract-deb-pkg, in no particular order: * Use bash * More strict error checking (set -u -o pipefail) * Print error message if target dir exists * Check number of arguments, provide usage info * Separate mirror to a variable for easier changing * Use mirrors.kernel.org * Use https and check cert with curl * Make curl silent * Use zgrep instead of gunzip | grep * Error out with a message in case more than 1 package was found * Do not create a target directory before we need it * Fix shellcheck warnings (way too many to mention) * ... * PROFIT!!!111 Signed-off-by:
Kir Kolyshkin <kolyshkin@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Kirill Kolyshkin authored
This comes with newer libc headers so we can catch errors earlier. Also, clang 4.0. Signed-off-by:
Kir Kolyshkin <kolyshkin@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Kirill Kolyshkin authored
Got this error trying to build criu on ppc64le under qemu, after updating the Dockerfile to use Ubuntu Xenial (rather than Trusty): > $ rm -rf .ccache; make -C scripts/build ppc64le-clang > > ... > > Processing triggers for libc-bin (2.24-9ubuntu2.2) ... > /sbin/ldconfig.real: 1: /sbin/ldconfig.real: Syntax error: "(" unexpected > /sbin/ldconfig.real: 1: /sbin/ldconfig.real: Syntax error: "(" unexpected > dpkg: error processing package libc-bin (--configure): > subprocess installed post-installation script returned error exit status 2 > ... Apparently, ldconfig.real binary header differs from others: root@3c7593d3298d:/# od -x /bin/ls | head -2 0000000 457f 464c 0102 0001 0000 0000 0000 0000 0000020 0002 0015 0001 0000 5680 1000 0000 0000 root@3c7593d3298d:/# od -x /sbin/ldconfig.real | head -2 0000000 457f 464c 0102 0301 0000 0000 0000 0000 0000020 0002 0015 0001 0000 1d58 1000 0000 0000 Amend the mask in binfmt_misc entry to take this into account. Signed-off-by:
Kir Kolyshkin <kolyshkin@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Kirill Kolyshkin authored
Let's use Ubuntu 17.04 "Zesty" for ARM-64 bit CI. Signed-off-by:
Kir Kolyshkin <kolyshkin@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Kirill Kolyshkin authored
Same as commit e4000c59 ("Dockerfiles: don't ignore make failures"). Seems that Dockerfile.fedora-asan copy/pasted an old version. Signed-off-by:
Kir Kolyshkin <kolyshkin@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Kirill Kolyshkin authored
This is what we have: > compel/src/lib/infect.c:1145:38: error: taking address of packed member > 'uc_sigmask' of class or structure 'ucontext_ia32' may result in an > unaligned pointer value [-Werror,-Waddress-of-packed-member] > blk_sigset = RT_SIGFRAME_UC_SIGMASK(f); > ~~~~~~~~~~~~~~~~~~~~~~~^~ > compel/include/uapi/asm/sigframe.h:133:4: note: expanded from macro > 'RT_SIGFRAME_UC_SIGMASK' > (&rt_sigframe->compat.uc.uc_sigmask)) > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 1 error generated. Indeed this results in an unaligned pointer, but as this is intended and well known (see commit dd6736bd "compel/x86/compat: pack ucontext_ia32"), we need to silence the warning here. For more details, see https://reviews.llvm.org/D20561 Originally found by Travis on Alpine Linux, reproduced on Ubuntu 17.10. [v2: fix for non-x86] Reported-by:
Andrei Vagin <avagin@virtuozzo.com> Signed-off-by:
Kir Kolyshkin <kolyshkin@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Mike Rapoport authored
Signed-off-by:
Mike Rapoport <rppt@linux.vnet.ibm.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Mike Rapoport authored
Signed-off-by:
Mike Rapoport <rppt@linux.vnet.ibm.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Michael Holzheu authored
For older kernels (e.g. RHEL7 with 3.10) it seems that wait(NULL) after ptrace(PTHREAD_ATTACH) does not work properly for threads that have to be created via clone(). Fix this by using waitpid() with the __WALL flag. >From the waitpid() man page: __WALL (since Linux 2.4) Wait for all children, regardless of type ("clone" or "non-clone"). Reported-by:
Adrian Reber <areber@redhat.com> Signed-off-by:
Michael Holzheu <holzheu@linux.vnet.ibm.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Stanislav Kinsburskiy authored
Plus patch replaces atoi(32 bit) to xatol(64 bits) for "pipe_ino" mount option thus fixing the issue with negative inode number for big values. v2: fixed uninitialized "err" variable in "parse_options" function Signed-off-by:
Stanislav Kinsburskiy <skinsbursky@virtuozzo.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Stanislav Kinsburskiy authored
These helpers are safe versions of atol() and atoi() respectively. And they check for overflow and NAN errors v3: 1) Added string print to convertion error message in xatol_base() 2) Added check for INT range in xatoi() Signed-off-by:
Stanislav Kinsburskiy <skinsbursky@virtuozzo.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Andrei Vagin authored
==36==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x60200000001c at pc 0x7fb26c88d5f9 bp 0x7ffc15087d40 sp 0x7ffc150874d0 WRITE of size 13 at 0x60200000001c thread T0 #0 0x7fb26c88d5f8 in vsprintf (/lib64/libasan.so.4+0x9e5f8) #1 0x7fb26c88d986 in __interceptor_sprintf (/lib64/libasan.so.4+0x9e986) #2 0x402453 in main /root/git/main/criu/test/zdtm/static/chroot.c:68 #3 0x7fb26c43e4d9 in __libc_start_main (/lib64/libc.so.6+0x204d9) #4 0x4031b9 in _start (/root/git/main/criu/test/zdtm/static/chroot+0x4031b9) Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Andrei Vagin authored
Without this message, we don't know which fdinfo can't be opened. https://github.com/xemul/criu/issues/390Signed-off-by:
Andrei Vagin <avagin@openvz.org> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Pavel Tikhomirov authored
On VZ7 we have a problem in random tests on iptables restore when running tests in parallel(one iptables-restore instance tries to lock xtables lock and fails while other instance(some iptables* command) is already holding the lock): ================== Run zdtm/static/socket_udp_shutdown in ns =================== Start test ./socket_udp_shutdown --pidfile=socket_udp_shutdown.pid --outfile=socket_udp_shutdown.out Run criu dump Run criu restore =[log]=> dump/zdtm/static/socket_udp_shutdown/77/1/restore.log ------------------------ grep Error ------------------------ (00.158864) 1: Running ip rule delete table local (00.167319) 1: Running ip rule restore (00.175647) 1: Running iptables-restore for iptables-restore Another app is currently holding the xtables lock. Perhaps you want to use the -w option? (00.185245) 1: Error (criu/util.c:719): exited, status=4 (00.185289) 1: Error (criu/net.c:1739): iptables-restore failed (00.185301) 1: Error (criu/net.c:2382): Can't create net_ns (00.185370) 1: Error (criu/util.c:1412): Can't wait or bad status: errno=0, status=65280(00.187281) Error (criu/mount.c:2944): mnt: Can't remove the directory /tmp/.criu.mntns.Ai5EG9: No such file or directory (00.187298) uns: calling exit_usernsd (-1, 1) (00.187344) uns: daemon calls 0x466a40 (93, -1, 1) (00.187361) uns: `- daemon exits w/ 0 (00.188375) uns: daemon stopped (00.188390) Error (criu/cr-restore.c:2450): Restoring FAILED. ------------------------ ERROR OVER ------------------------ Test zdtm/static/socket_udp_shutdown FAIL at CRIU restore https://ci.openvz.org/job/CRIU/job/CRIU-virtuozzo/job/criu-dev/2873 It happens now in every test-suit run on VZ7 host as we had updated to 1.4.21-18 iptables package, which has patches for xlocks support in iptables-restore ported: * Mon Apr 24 2017 Thomas Woerner <twoerner@redhat.com> 1.4.21-18 - Add support for --wait options to restore commands (RHBZ#1438597) Whether these patches are ported to other distribution packages we'll have these problem in other distributions. Just add -w to wait lock on iptables-restore as older versions does not error on invalid option, just warning is printed. Signed-off-by:
Pavel Tikhomirov <ptikhomirov@virtuozzo.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Kirill Tkhai authored
New ip[6]tables-restore utils has this parameter, which allows to wait for xtables lock, if it's occupied. When they don't wait, then the restore of iptables fails. Old versions just ignore this parameter with error in stderr, but it does not make them fail. So, pass it unconditionally. Signed-off-by:
Kirill Tkhai <ktkhai@virtuozzo.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Mike Rapoport authored
The errors set by both uffdio_copy and uffdio_zeropage are the same and require the same handling. Let's use a helper function to handle the errors returned by uffdio_copy and uffdio_zero. Signed-off-by:
Mike Rapoport <rppt@linux.vnet.ibm.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Michael Holzheu authored
When running 'make zdtm' on s390x it fails on RHEL7 with: make[3]: Leaving directory `/tmp/criu/test/zdtm/lib' CC s390x_regs_check.o s390x_regs_check.c: In function "util_hexdump_grp": s390x_regs_check.c:214:7: error: "ptr" may be used uninitialized in this function [-Werror=maybe-uninitialized] ptr += sprintf(ptr, "%02x", buf[i]); Fix this and assign ptr from the beginning to help gcc. Reported-by:
Adrian Reber <adrian@lisas.de> Signed-off-by:
Michael Holzheu <holzheu@linux.vnet.ibm.com> Acked-by:
Adrian Reber <areber@redhat.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
- 05 Oct, 2017 2 commits
-
-
Andrei Vagin authored
Install the last version of Docker, start a container and C/R it a few times.
-
Andrei Vagin authored
The origin idea was to set --empty net for criu dump and criu restore, but before cde33dcb ("empty-ns: Don't C/R iptables too (v2)"), criu restore worked without --empty net and we didn't notice that docker doesn't set this option on restore. After a small brainstorm, we decided that it is better to remove this requirement. Docker has to set this option, but with this changes, the docker issue will be less urgent. https://github.com/checkpoint-restore/criu/issues/393
-
- 27 Sep, 2017 1 commit
-
-
Pavel Emelyanov authored
So, the long-running task with lazy restore is (almost) finished :) Some issues are still to be resolved, but the heaviest lift has been done. Another notable thing is VDSO C/R rework. It's now more robust and fast. Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
- 25 Sep, 2017 1 commit
-
-
Pavel Emelyanov authored
When merging files into one image we've forgotten about crit x feature that scans image files by names. https://github.com/xemul/criu/issues/381 The patch was made for master (as in criu-dev there was problem with pstree_item.pid parsing), but should apply to dev smoothly. Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
- 22 Sep, 2017 2 commits
-
-
Mike Rapoport authored
When an error occurs we need to close a file descriptor and unmap a region. Use a separate label for each cleanup. Fix CID 182644 (#1-2 of 2): Use after close (USE_AFTER_FREE)8. pass_closed_arg: Passing closed handle f.fd as an argument to bclose Signed-off-by:
Mike Rapoport <rppt@linux.vnet.ibm.com> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Mike Rapoport authored
It's not really interesting and just pollutes the log Signed-off-by:
Mike Rapoport <rppt@linux.vnet.ibm.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
- 20 Sep, 2017 10 commits
-
-
Stanislav Kinsburskiy authored
The intention was to make sure, that only one packet is sent at a time. And thus read has to return exactly the size of one packet. But it doesnt' work as expected, because size of autofs_v5_packet_union differs on 32 bit and 64 bit architectures. This is a bug, but it's hidden so deeply, that no one really cares by the following 2 aspects: 1) Autofs pipe has O_DIRECT flag, which means excess bytes will be discarded upon read. 2) No one tries to read more than one packet size at a time. So let's fix the test instead and do not try to read more bytes, than expected. Signed-off-by:
Stanislav Kinsburskiy <skinsbursky@virtuozzo.com> Signed-off-by:
Cyrill Gorcunov <gorcunov@virtuozzo.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Kirill Tkhai authored
Improve dump_tcp_conn_state() *debugibility*. Signed-off-by:
Kirill Tkhai <ktkhai@virtuozzo.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Mike Rapoport authored
Signed-off-by:
Mike Rapoport <rppt@linux.vnet.ibm.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Andrei Vagin authored
We don't need to look up a mount info element, because we already have it there. Cc: Cyrill Gorcunov <gorcunov@openvz.org> Cc: Dmitry Safonov <dsafonov@virtuozzo.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Dmitry Safonov authored
That's a merge conflict between vdso patches set and s390 set. Cc: Michael Holzheu <holzheu@linux.vnet.ibm.com> Cc: Alice Frosi <alice@linux.vnet.ibm.com> Signed-off-by:
Dmitry Safonov <dsafonov@virtuozzo.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Dmitry Safonov authored
We can save some syscalls for *each* dumpee if we don't open()/seek()/read()/close() /proc/pid/pagemap for each dumpee and even don't use parasite to parse symtable if pagemap is unavailable. Signed-off-by:
Dmitry Safonov <dsafonov@virtuozzo.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Dmitry Safonov authored
If it does preserve, we can omit checking pagemap for dumpee or filling symtable in parasite. Signed-off-by:
Dmitry Safonov <dsafonov@virtuozzo.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Dmitry Safonov authored
Just map vdso at restorer's parking zone, no need for searching it in CRIU and remap it to park zone. That will save some open()/read()/close() syscalls for parsing maps file. Signed-off-by:
Dmitry Safonov <dsafonov@virtuozzo.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Dmitry Safonov authored
If there is no vdso in images - we don't need to map it. Signed-off-by:
Dmitry Safonov <dsafonov@virtuozzo.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Dmitry Safonov authored
Test for previously fixed bugs for vdso-trampolines insertion: - unmapping original vvar (which went unnoticed) - leaving rt-vvar after each C/R cycle and resulting pollution Signed-off-by:
Dmitry Safonov <dsafonov@virtuozzo.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-