- 23 Oct, 2017 1 commit
-
-
Pavel Emelyanov authored
As usually -- many bugfixes and several new features. The s390x stuff goes well too. The most tempting new feature is the ability to dump and restore files sent over unix sockets (SCM_RIGHTS). Signed-off-by:Pavel Emelyanov <xemul@virtuozzo.com>
-
- 22 Oct, 2017 5 commits
-
-
Andrei Vagin authored
Signed-off-by:Andrei Vagin <avagin@virtuozzo.com>
-
Andrei Vagin authored
Its declaration was changed in glibc headers and we don't want to handle two version of itю In file included from compel/include/uapi/compel/infect.h:6:0, from compel/include/uapi/compel/compel.h:12, from compel/include/log.h:4, from compel/arch/aarch64/src/lib/infect.c:8: compel/arch/aarch64/src/lib/infect.c: In function 'sigreturn_prep_regs_plain': compel/include/uapi/compel/asm/sigframe.h:47:99: error: 'mcontext_t {aka struct <anonymous>}' has no member named '__reserved'; did you mean '__glibc_reserved1'? #define RT_SIGFRAME_AUX_CONTEXT(rt_sigframe) ((struct aux_context*)&(rt_sigframe)->uc.uc_mcontext.__reserved) ^ compel/include/uapi/compel/asm/sigframe.h:48:41: note: in expansion of macro 'RT_SIGFRAME_AUX_CONTEXT' #define RT_SIGFRAME_FPU(rt_sigframe) (&RT_SIGFRAME_AUX_CONTEXT(rt_sigframe)->fpsimd) ^~~~~~~~~~~~~~~~~~~~~~~ compel/arch/aarch64/src/lib/infect.c:34:34: note: in expansion of macro 'RT_SIGFRAME_FPU' struct fpsimd_context *fpsimd = RT_SIGFRAME_FPU(sigframe); ^~~~~~~~~~~~~~~ make[1]: *** [/builddir/build/BUILD/criu-3.5/scripts/nmk/scripts/build.mk:209: compel/arch/aarch64/src/lib/infect.o] Error 1 make: *** [Makefile.compel:36: compel/libcompel.a] Error 2 error: Bad exit status from /var/tmp/rpm-tmp.IExY9K (%build) This seems to be related to the following glibc changes: https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4fa9b3bfe6759c82beb4b043a54a3598ca467289Reported-by:Adrian Reber <adrian@lisas.de> Tested-by:
-
Dmitry Safonov authored
Add handeling of R_X86_64_GOTPCRELX and R_X86_64_REX_GOTPCRELX. They are not that old, so I provided ifdef-guards for them. According to x86-64 ABI specification paper, they should be generated instead of R_X86_64_GOTPCREL for cases when relaxation is possible. At this moment we can handle them the same way like R_X86_64_GOTPCREL. [0] https://github.com/hjl-tools/x86-psABI/wiki/x86-64-psABI-r249.pdf Fixes: #397 Cc: Cyrill Gorcunov <gorcunov@openvz.org> Reported-by:
Adrian Reber <areber@redhat.com> Signed-off-by:
Dmitry Safonov <dima@arista.com> Signed-off-by:
-
Andrei Vagin authored
p + FAST_SIZE > buffer + length In this sentence p + FAST_SIZE may be bigger than (1<<32), and we will be in trouble. $ gdb -c coredump test/zdtm/static/write_read01 (gdb) p p $3 = (uint8_t *) 0xffffa89e (gdb) p buffer $4 = (uint8_t *) 0xfff06780 (gdb) p length $5 = 1000000 Signed-off-by: -
Mike Rapoport authored
The lazy-thp may fail with older kernels if khugepaded will be fast enough to merge pages in the partially populated areas. Signed-off-by:
Mike Rapoport <rppt@linux.vnet.ibm.com> Signed-off-by:
-
- 17 Oct, 2017 34 commits
-
-
Pavel Emelyanov authored
Signed-off-by: -
Pavel Emelyanov authored
The CMSG_NXTHDR checks the length of the __next__ cmsg, i.e. the one that it is about to return for filling. Thus, keeping there anything but zeroes is unsafe. Reported-by:
Pavel Tikhomirov <snorcht@gmail.com> Signed-off-by:
-
Pavel Emelyanov authored
Most of the pieces has already been described in the previous patches :) so here's the summary. * Dump: When receiving a message, also receive any SCM-s (already there) and when SCM_RIGHTs one is met -- go ahead and just dump received descriptors using regular code, but taking current as the victim task. Few words about file paths resolution -- since we do dump path-ed files by receiving them from victim's parasite, such files sent via sockets should still work OK, as we still receive them, just from another socket. Several problems here: 1. Unix sockets sent via unix sockets form knots. Not supported. 2. Eventpolls sent via unix might themseves poll unix sockets. Knots again. Not supported either. * Restore: On restore we need to make unix socket wait for the soon-to-be-scm-sent descriptors to get restored, so we need to find them, then put a dependency. After that, the fake fdinfo entry is attached to the respective file descs, when sent the respective descriptors are closed. https://github.com/xemul/criu/issues/251 v2: Addressed comments from Kirill * Moved prepare_scms before adding fake fles (with comment) * Add scm-only fles as fake, thus removing close_scm_fds * Try hard finding any suitable fle to use as scm one when queuing them for unix socket scm list, only allocate a new one if really needed Reviewed-by:
Kirill Tkhai <ktkhai@virtuozzo.com> Signed-off-by:
-
Pavel Emelyanov authored
Reviewed-by:
-
Pavel Emelyanov authored
Reviewed-by:
-
Pavel Emelyanov authored
In order to make sender of a descriptor (unix socket) be restored _after_ the descriptor in question, we need to find out those sockets early (before post-prep calls). The problem is that current code gives us info about who's the queuer for who only in post-prep hooks, so the peer resolution should happen right in collect callback. At the same time we need to make sure that all peers configured in the image exist, as well as need to put master/slave flags for socketpairs. Both these actions can only happen in post-prep. Said that -- the current peer resolve routine should be split into two steps. v2: Handle the socket connected to self (dgram) Reviewed-by:
-
Pavel Emelyanov authored
The sk-queue.img keeps socket IDs as recepient descriptor. For SCM code we'll need to find the unix sk info who is the sender for a particular other socket by this ID. There's already the queuer field in the unix_sk_info, but it needs to be an ID rather than inode. Fortunately, id-inode pairs are unique. Reviewed-by:
-
Pavel Emelyanov authored
For SCM restore we need to know all queuers, even if they are socketpair-s, but current code skips this setting for one half of them. So set this info for every socket out there. Reviewed-by:
-
Pavel Emelyanov authored
In SCM code there will be the need to attach a newly created FdinfoEntry to a particulat file desc object, then get the created fdinfo helper object back. Current code only allows this via two lookup calls -- first one to attach entry to desc by ID (lookup #1), then get the fdinfo helper by FD (lookup #2). Fortunately, the exising code allows simple split that gives us the optimized routine. Reviewed-by:
-
Pavel Emelyanov authored
In SCM patch we'll need to generate temporary fdinfo entry for a task that will send descriptors via sockets. Sometimes the files in questions will NOT have any other fdinfo-s (if they are SCM-sent and closed), so we need a helper that would either give us existing fdinfo or say there's no such. Reviewed-by:
-
Pavel Emelyanov authored
An aux code to dump the received file and report back its ID and type. Reviewed-by:
-
Pavel Emelyanov authored
Actually all file-s we dump have unique IDs, regardless of their types. This fact will be used to reduce complexity of the SCM code -- instead of keeping TYPE:ID pair it'll save only the ID. Siad that -- we will need the way to lookup desc by ID only. v2: Older images had fifo-s and tty-s having matching IDs with respective reg-file entries Reviewed-by: -
Pavel Emelyanov authored
To support SCMs we'll need to receive them into criu task (see the SCM patch for details), then dump the received file as if it was in the dumpee. Then the info about received descriptor will be written into packet entry. For this we'll need to perform all the regular file dumping code BUT not write the FdinfoEntry into image, so shuffle the code for that. The gist of the patch is in two changes -- one in the do_dump_gen_file(), the other in dump_task_files_seized(). The rest is just tossing the arguments of the functions relevant to that change. Reviewed-by:
-
Pavel Emelyanov authored
Same thing as for fifo-s. Reviewed-by:
-
Pavel Emelyanov authored
The plan is to have all file entries have unique ID. Fifo generates a reg file entry to reuse the whole reg-files c/r-ing engine (ghosts, open-by-path, etc.) and right now ID for this entry is the same as for fifo entry. Reviewed-by:
-
Pavel Emelyanov authored
SCM-dumping code won't provide the ctl for TTY dump. To make this work we'll have to peek required tty info from current (see the SCM patch), but I doubt that anyone sends TTYs via sockets ... so keep this in TODO list. Reviewed-by:
-
Pavel Emelyanov authored
Only the send code is altered, as upon receiving kernel merges all scm_rights int one. CRIU relies on this merge and this is to catch situations if the kernel suddenly stops doing this. Reviewed-by:
-
Pavel Emelyanov authored
Reviewed-by:
-
Pavel Emelyanov authored
Reviewed-by:
-
Pavel Emelyanov authored
Reviewed-by:
-
Kirill Tkhai authored
This will be used in further to determine whether task's namespace allows to restore file_desc. Signed-off-by:
-
Kirill Tkhai authored
Keep int pid with short-len fields to avoid alignment gaps in structure. Signed-off-by:
-
Kirill Tkhai authored
The algorhythm of searching file master will be more complicated in next patches. So, move current functionality in separate func. Signed-off-by:
-
Kirill Tkhai authored
Signed-off-by:
-
Kirill Tkhai authored
The only user is fifo, but it uses collect_fd() to do read only actions (the only change is fifo_info::reg_d population, which may be easily moved to open_fifo_fd()). So, move the collect_special_file() functionality from collect_fifo_fd() to open_fifo_fd() and kill collect_fd method at all. Signed-off-by: -
Kirill Tkhai authored
Add new argument to this function. Signed-off-by:
-
Kirill Tkhai authored
Declare it extern and allow to use outside files.c. Signed-off-by:
-
Kirill Tkhai authored
On 01.06.2017 14:34, Kirill Tkhai wrote: > Everything is prepared: the pair "type and id" is > uniqul, so find_file_desc() in collect_fd() will > work as expected and it will find the file_desc > we just added in autofs_create_pipe()->collect_one_pipe_ops(). > > So, the not-generic helper may be killed. > > Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com> Returned debug print: [PATCH 4/5 v2]files: Kill autofs_create_fle() and use generic helper Everything is prepared: the pair "type and id" is uniqul, so find_file_desc() in collect_fd() will work as expected and it will find the file_desc we just added in autofs_create_pipe()->collect_one_pipe_ops(). So, the not-generic helper may be killed. v2: Leave debug print on the place. Signed-off-by:
Stanislav Kinsburskiy <skinsbursky@virtuozzo.com> Acked-by:
-
Kirill Tkhai authored
shmalloc() already returns address with sizeof(unsigned long) alignment. So, the second alignment is useless. Signed-off-by:
-
Kirill Tkhai authored
Allow to mark some fles as "fake" and close them, when they are not needed. v2: Cache fake file in separate list, when they are restored, to do not iterate over files list again. Signed-off-by:
-
Kirill Tkhai authored
Signed-off-by:
-
Kirill Tkhai authored
It has only one user. Also, in next patches will be used pstree_item_by_virt() function, and I don't want to add "#include" to "files.h" for it, and to nest headers. Signed-off-by:
-
Kirill Tkhai authored
Fake masters are files, which are not owned by a process, that is able to open them. Signed-off-by:
-
Pavel Emelyanov authored
Due to a misprint in an if the 6rd info for sit device was restored when not present. https://github.com/xemul/criu/issues/366Signed-off-by:
-
