mirror of
https://github.com/checkpoint-restore/criu.git
synced 2026-01-23 02:14:37 +00:00
e2268aa39c
This is a first try to include userfaultfd with criu. Right now it
still requires a "normal" checkpoint. After checkpointing the
application it can be restored with the help of userfaultfd.
All restored pages with MAP_ANONYMOUS and MAP_PRIVATE set are marked as
being handled by userfaultfd.
As soon as the process is restored it blocks on the first memory access
and waits for pages being transferred by userfaultfd.
To handle the required pages a new criu command has been added. For a
userfaultfd supported restore the first step is to start the
'lazy-pages' server:
criu lazy-pages -v4 -D /tmp/3/ --address /tmp/userfault.socket
This is part 1 of the userfaultfd integration which provides the
'lazy-pages' server implementation.
v2:
* provide option '--lazy-pages' to enable uffd style restore
* use send_fd()/recv_fd() provided by criu (instead of own
implementation)
* do not install the uffd as service_fd
* use named constants for MAP_ANONYMOUS
* do not restore memory pages and then later mark them as uffd
handled
* remove function find_pages() to search in pages-<id>.img;
now using criu functions to find the necessary pages;
for each new page search the pages-<id>.img file is opened
* only check the UFFDIO_API once
* trying to protect uffd code by CONFIG_UFFD;
use make UFFD=1 to compile criu with this patch
v3:
* renamed the server mode from 'uffd' -> 'lazy-pages'
* switched client and server roles transferring the UFFD FD
* the criu part running in lazy-pages server mode is now
waiting for connections
* the criu restore process connects to the lazy-pages server
to pass the UFFD FD
* before UFFD copying anything else the VDSO pages are copied
as it fails to copy unused VDSO pages once the process is running.
this was necessary to be able to copy all pages.
* if there are no more UFFD messages for 5 seconds the lazy-pages
server switches in copy mode to copy all remaining pages, which
have not been requested yet, into the restored process
* check the UFFDIO_API at the correct place
* close UFFD FD in the restorer to remove open UFFD FD in the
restored process
v4:
* removed unnecessary madvise() calls ; it seemed necessary when
first running tests with uffd; it actually is not necessary
* auto-detect if build-system provides linux/userfaultfd.h
header
* simplify unix domain socket setup and communication.
* use --address to specify the location of the used
unix domain socket
v5:
* split the userfaultfd patch in multiple smaller patches
* introduced vma_can_be_lazy() function to check if a page
can be handled by uffd
* moved uffd related code from cr-restore.c to uffd.c
* handle failure to register a memory page of the restored process
with userfaultfd
v6:
* get PID of to be restored process from the 'criu restore' process;
first the PID is transferred and then the UFFD
* code has been re-ordered to be better prepared for lazy-restore
from remote host
* compile test for UFFD availability only once
Signed-off-by: Adrian Reber <areber@redhat.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
72 lines
2.1 KiB
Text
72 lines
2.1 KiB
Text
include $(__nmk_dir)utils.mk
|
|
include $(__nmk_dir)msg.mk
|
|
include scripts/feature-tests.mak
|
|
|
|
ifeq ($(call try-cc,$(FEATURE_TEST_LIBBSD_DEV),-lbsd),true)
|
|
LIBS_FEATURES += -lbsd
|
|
FEATURE_DEFINES += -DCONFIG_HAS_LIBBSD
|
|
endif
|
|
|
|
ifeq ($(call pkg-config-check,libselinux),y)
|
|
LIBS_FEATURES += -lselinux
|
|
FEATURE_DEFINES += -DCONFIG_HAS_SELINUX
|
|
endif
|
|
|
|
export LIBS += $(LIBS_FEATURES)
|
|
|
|
CONFIG_FILE = .config
|
|
|
|
$(CONFIG_FILE):
|
|
touch $(CONFIG_FILE)
|
|
|
|
ifeq ($(SRCARCH),x86)
|
|
# CONFIG_COMPAT is only for x86 now, no need for compile-test other archs
|
|
ifeq ($(call try-asm,$(FEATURE_TEST_X86_COMPAT)),true)
|
|
export CONFIG_COMPAT := y
|
|
FEATURE_DEFINES += -DCONFIG_COMPAT
|
|
else
|
|
$(info Note: Building without ia32 C/R, missed ia32 support in gcc)
|
|
$(info $(info) That may be related to missing gcc-multilib in your)
|
|
$(info $(info) distribution or you may have Debian with buggy toolchain)
|
|
$(info $(info) (issue https://github.com/xemul/criu/issues/315))
|
|
endif
|
|
endif
|
|
|
|
export DEFINES += $(FEATURE_DEFINES)
|
|
export CFLAGS += $(FEATURE_DEFINES)
|
|
|
|
ifeq ($(call try-cc,$(FEATURE_TEST_UFFD)),y)
|
|
export UFFD := 1
|
|
endif
|
|
|
|
FEATURES_LIST := TCP_REPAIR STRLCPY STRLCAT PTRACE_PEEKSIGINFO \
|
|
SETPROCTITLE_INIT MEMFD TCP_REPAIR_WINDOW
|
|
|
|
# $1 - config name
|
|
define gen-feature-test
|
|
ifeq ($$(call try-cc,$$(FEATURE_TEST_$(1)),$$(LIBS_FEATURES),$$(DEFINES)),true)
|
|
$(Q) @echo '#define CONFIG_HAS_$(1)' >> $$@
|
|
$(Q) @echo '' >> $$@
|
|
endif
|
|
endef
|
|
|
|
define config-header-rule
|
|
$(CONFIG_HEADER): scripts/feature-tests.mak $(CONFIG_FILE)
|
|
$$(call msg-gen, $$@)
|
|
$(Q) @echo '#ifndef __CR_CONFIG_H__' > $$@
|
|
$(Q) @echo '#define __CR_CONFIG_H__' >> $$@
|
|
$(Q) @echo '' >> $$@
|
|
$(call map,gen-feature-test,$(FEATURES_LIST))
|
|
$(Q) @cat $(CONFIG_FILE) | sed -n -e '/^[^#]/s/^/#define CONFIG_/p' >> $$@
|
|
ifeq ($$(VDSO),y)
|
|
$(Q) @echo '#define CONFIG_VDSO' >> $$@
|
|
$(Q) @echo '' >> $$@
|
|
endif
|
|
ifeq ($$(UFFD),1)
|
|
$(Q) @echo '#define CONFIG_HAS_UFFD' >> $$@
|
|
$(Q) @echo '' >> $$@
|
|
endif
|
|
$(Q) @echo '#endif /* __CR_CONFIG_H__ */' >> $$@
|
|
endef
|
|
|
|
$(eval $(config-header-rule))
|