mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-22 18:07:57 +00:00
Code Issues Releases Wiki Activity
criu/include/files-reg.h

51 lines
1.2 KiB
C
Raw Permalink Normal View History

hdrs: Fixup reinclusion preprocessor constants Make them look like __CR_<smth>_H__ with sed -e '1,2s/#\(ifndef\|define\) _\?_\?\(CR_\)\?/#\1 __CR_/' -e '1,2s/_H_\?_\?.*$/_H__/' on every header file. Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2012-12-24 15:36:14 +04:00
#ifndef __CR_FILES_REG_H__
#define __CR_FILES_REG_H__
files: Move regular files handling code to files-reg Instead of spreading regular files handling code over files.c and cr-dump.c move it to files-reg.c. This allows to extend regular file handling code in future without disturbing other source files and make code logically coupled, where files.c is mostly a place for general file handling code unrelated to file type specifics. While mostly it was code tossing there is some change I have to notice -- the structure ghost_file was previously declared in two paces cr-dump.c and files.c, in cr-dump.c it was used for dumping while in files.c it was used for restore. The structure had different members. So to resolve this conflict the ghost_file structure was renamed to ghost_file_dumpee. Nothing else is changed. Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2012-06-20 20:00:30 +04:00
x86: moved x86-specific files into the directory arch/x86. * The following files goes into the directory arch/x86/include/asm unmodified: - include/atomic.h, - include/linkage.h, - include/memcpy_64.h, - include/types.h, - include/bitops.h, - pie/parasite-head-x86-64.S, - include/processor-flags.h, - include/syscall-x86-64.def. * Changed include directives in the source files that include the headers listed above. * Modified build scripts to reflect the source moves. Signed-off-by: Alexander Kartashov <alekskartashov@parallels.com> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2013-01-09 17:02:47 +04:00
#include "asm/types.h"
fifo: Add checkpoint restore for fifos v4 Checkpoint and restore of fifo is similar to pipes c/r except the pipe end-points are named file. Because the fifo has a name we use regular files facility for fifo path c/r. Still there is a trick used to "open" fifo: the opening procedure migh sleep if a fifo's peer is not yet opened, so before doing a real open we yield a fake open procedure (with O_RDWR flag) which prevents us from sleeping even if peer is not yet ready. Also we need writable fifo end to restore data queued. v2: - add open/priv members to reg_file_info - make open_fifo_fd to use open_fe_fd - comment on pipe_id - make sure the fifo data is not restored twice v3: - drop useless fixme comment and add sane one v4: - Use restore_data flag to escape data restore duplication - Use S_ISREG for file contents copying Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2012-06-26 02:36:13 +04:00
#include "files.h"
#include "image.h"
files: Move regular files handling code to files-reg Instead of spreading regular files handling code over files.c and cr-dump.c move it to files-reg.c. This allows to extend regular file handling code in future without disturbing other source files and make code logically coupled, where files.c is mostly a place for general file handling code unrelated to file type specifics. While mostly it was code tossing there is some change I have to notice -- the structure ghost_file was previously declared in two paces cr-dump.c and files.c, in cr-dump.c it was used for dumping while in files.c it was used for restore. The structure had different members. So to resolve this conflict the ghost_file structure was renamed to ghost_file_dumpee. Nothing else is changed. Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2012-06-20 20:00:30 +04:00
headers: Change "../protobuf/" to "protobuf/" No need to walk up the directories if we need to include protobuf file. This was always a bad use of ability to walk the filesystem from other headers. Same time we don't need -I$(SRC_DIR)/protobuf/ in general makefile anymore. [xemul: Small fixlet in head Makefile, since patch it out-of-order] Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2013-02-15 17:33:06 +04:00
#include "protobuf/regfile.pb-c.h"
#include "protobuf/ghost-file.pb-c.h"
protobuf: Use RegFileEntry instead of reg_file_entry structure v3 This patch switches reg_file_entry structure with RegFileEntry protobuf entry. Note that there a few nits remains - old fown_t structure doesn't scale well with FownEntry from RegFileEntry, so to not mess with rest of crtools code I've added a couple of opencoded copy operands, will clean this aspect up once rest of code is converted - the "show" procedure doesn't print fown for same reason v2: - rename fown_t to fown_entry in .proto v3: - don't print nil symbol on show Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2012-07-17 07:17:02 +04:00
files: Move regular files handling code to files-reg Instead of spreading regular files handling code over files.c and cr-dump.c move it to files-reg.c. This allows to extend regular file handling code in future without disturbing other source files and make code logically coupled, where files.c is mostly a place for general file handling code unrelated to file type specifics. While mostly it was code tossing there is some change I have to notice -- the structure ghost_file was previously declared in two paces cr-dump.c and files.c, in cr-dump.c it was used for dumping while in files.c it was used for restore. The structure had different members. So to resolve this conflict the ghost_file structure was renamed to ghost_file_dumpee. Nothing else is changed. Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2012-06-20 20:00:30 +04:00
struct cr_fdset;
struct fd_parms;
files-reg: Move struct file_remap to the header We will need to use it in inotify code. Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2012-12-06 11:10:10 +04:00
struct file_remap {
char *path;
files: Support ghost directories restore If we have opened and rmdir-ed directory, the dump works OK creating the ghost file and remap, but restore creates _file_ instead of directory. Fix this. Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2014-07-03 19:06:58 +04:00
bool is_dir;
link-remap: open link-remap files from correct mountpoints (v3) Here is a problem with ghost files. Links are created on restore, but they can't be created on any mount point, because a mount point can be non-root bind-mount of another one. So we need to find the root mount and create all links there. v2: clean up v3: add optimization for the case when both links on the same mount point. v4: don't look up mount points by mnt_id in a second time. Signed-off-by: Andrey Vagin <avagin@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2014-08-06 15:51:57 +04:00
int mnt_id;
files-reg: Move struct file_remap to the header We will need to use it in inotify code. Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2012-12-06 11:10:10 +04:00
unsigned int users;
};
fifo: Add checkpoint restore for fifos v4 Checkpoint and restore of fifo is similar to pipes c/r except the pipe end-points are named file. Because the fifo has a name we use regular files facility for fifo path c/r. Still there is a trick used to "open" fifo: the opening procedure migh sleep if a fifo's peer is not yet opened, so before doing a real open we yield a fake open procedure (with O_RDWR flag) which prevents us from sleeping even if peer is not yet ready. Also we need writable fifo end to restore data queued. v2: - add open/priv members to reg_file_info - make open_fifo_fd to use open_fe_fd - comment on pipe_id - make sure the fifo data is not restored twice v3: - drop useless fixme comment and add sane one v4: - Use restore_data flag to escape data restore duplication - Use S_ISREG for file contents copying Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2012-06-26 02:36:13 +04:00
struct reg_file_info {
struct file_desc d;
protobuf: Use RegFileEntry instead of reg_file_entry structure v3 This patch switches reg_file_entry structure with RegFileEntry protobuf entry. Note that there a few nits remains - old fown_t structure doesn't scale well with FownEntry from RegFileEntry, so to not mess with rest of crtools code I've added a couple of opencoded copy operands, will clean this aspect up once rest of code is converted - the "show" procedure doesn't print fown for same reason v2: - rename fown_t to fown_entry in .proto v3: - don't print nil symbol on show Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2012-07-17 07:17:02 +04:00
RegFileEntry *rfe;
rst file: Introduce the file_remap abstraction For linked remaps we'll use similar technique as for ghost files, but lighter. For that sake make reg_file_info remap to file_remap, not to the whole host_file. Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2012-09-26 06:20:06 +04:00
struct file_remap *remap;
files: Sanity check for reg file on restore is not corrupted When opening a reg file on restore -- check that the file size we opened matches the on we saw on dump. This is not bullet-proof protection, but is helpful to protect against FS updates between dump/restore. Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2014-06-24 23:38:48 +04:00
bool size_checked;
fifo: Add checkpoint restore for fifos v4 Checkpoint and restore of fifo is similar to pipes c/r except the pipe end-points are named file. Because the fifo has a name we use regular files facility for fifo path c/r. Still there is a trick used to "open" fifo: the opening procedure migh sleep if a fifo's peer is not yet opened, so before doing a real open we yield a fake open procedure (with O_RDWR flag) which prevents us from sleeping even if peer is not yet ready. Also we need writable fifo end to restore data queued. v2: - add open/priv members to reg_file_info - make open_fifo_fd to use open_fe_fd - comment on pipe_id - make sure the fifo data is not restored twice v3: - drop useless fixme comment and add sane one v4: - Use restore_data flag to escape data restore duplication - Use S_ISREG for file contents copying Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2012-06-26 02:36:13 +04:00
char *path;
};
files: Move regular files handling code to files-reg Instead of spreading regular files handling code over files.c and cr-dump.c move it to files-reg.c. This allows to extend regular file handling code in future without disturbing other source files and make code logically coupled, where files.c is mostly a place for general file handling code unrelated to file type specifics. While mostly it was code tossing there is some change I have to notice -- the structure ghost_file was previously declared in two paces cr-dump.c and files.c, in cr-dump.c it was used for dumping while in files.c it was used for restore. The structure had different members. So to resolve this conflict the ghost_file structure was renamed to ghost_file_dumpee. Nothing else is changed. Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2012-06-20 20:00:30 +04:00
extern int open_reg_by_id(u32 id);
files: Split open_reg_by_id into two parts Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2014-07-03 19:07:58 +04:00
extern int open_reg_fd(struct file_desc *);
files: Fix open_path() to provide mntns root fd to callbacks This fixes the support for fifo-s in mount namespaces and makes it easier to control the correct open_path() usage in the future. Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2014-06-06 12:20:02 +04:00
extern int open_path(struct file_desc *, int (*open_cb)(int ns_root_fd,
struct reg_file_info *, void *), void *arg);
files: Move regular files handling code to files-reg Instead of spreading regular files handling code over files.c and cr-dump.c move it to files-reg.c. This allows to extend regular file handling code in future without disturbing other source files and make code logically coupled, where files.c is mostly a place for general file handling code unrelated to file type specifics. While mostly it was code tossing there is some change I have to notice -- the structure ghost_file was previously declared in two paces cr-dump.c and files.c, in cr-dump.c it was used for dumping while in files.c it was used for restore. The structure had different members. So to resolve this conflict the ghost_file structure was renamed to ghost_file_dumpee. Nothing else is changed. Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2012-06-20 20:00:30 +04:00
extern void clear_ghost_files(void);
files-reg: Use global mutex to serialize ghost file creation Otherwise there is a race between files with same names: link(name -> ghost) link(name->ghost) open(name) unlink(name) open(name) -> ENOENT Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2012-09-17 20:12:58 +04:00
extern int prepare_shared_reg_files(void);
files: Compact the code by removing per-file dump helpers Since *all* of them just call do_dump_gen_file with proper ops, just call one directly. Compacts the code. Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2013-06-14 00:11:08 +04:00
extern const struct fdtype_ops regfile_dump_ops;
files: Move regular files handling code to files-reg Instead of spreading regular files handling code over files.c and cr-dump.c move it to files-reg.c. This allows to extend regular file handling code in future without disturbing other source files and make code logically coupled, where files.c is mostly a place for general file handling code unrelated to file type specifics. While mostly it was code tossing there is some change I have to notice -- the structure ghost_file was previously declared in two paces cr-dump.c and files.c, in cr-dump.c it was used for dumping while in files.c it was used for restore. The structure had different members. So to resolve this conflict the ghost_file structure was renamed to ghost_file_dumpee. Nothing else is changed. Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2012-06-20 20:00:30 +04:00
extern int dump_one_reg_file(int lfd, u32 id, const struct fd_parms *p);
files-reg: Add a few helpers to access ghost files remaps from inotify The remap_put will be needed to defer unlinking of ghost files if they are referred from inotify system. The lookup_remap is needed to figure out if the watch target the inotify has present in ghost files list. Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2012-12-06 11:10:14 +04:00
extern struct file_remap *lookup_ghost_remap(u32 dev, u32 ino);
extern void remap_put(struct file_remap *remap);
vma: Don't lookup file_desc for vma twice We do it first -- on collect, second -- on restore. The 2nd lookup is excessive, we can put fd pointer on vm_area at lookup and reuse one later. Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2014-02-07 13:51:29 +04:00
extern struct file_desc *collect_special_file(u32 id);
files-reg: Add a few helpers to access ghost files remaps from inotify The remap_put will be needed to defer unlinking of ghost files if they are referred from inotify system. The lookup_remap is needed to figure out if the watch target the inotify has present in ghost files list. Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2012-12-06 11:10:14 +04:00
collect: Shorten common images collecting code Now we have a set of cinfo-s, it's possible to collect all this stuff in a plan for-loop. Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2013-08-21 03:52:18 +04:00
extern struct collect_image_info reg_file_cinfo;
extern struct collect_image_info remap_cinfo;
dump: Don't forget to cleanup link remap if needed In case if checkpoint is failed or -R option passed we need to remove link remap files created during dump procedure. Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2013-11-01 00:50:48 +04:00
extern void delete_link_remaps(void);
extern void free_link_remaps(void);
headers: Unify include guards (in comments) and a few fixes - fix names in comments - add empty lines where needed - fix rbtree.h - fix syscall-types.h Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2012-12-25 22:40:24 +04:00
#endif /* __CR_FILES_REG_H__ */
Reference in New Issue Copy Permalink