[CRIU] [PATCH] criu: always enable the userfaultfd support

Dmitry Safonov dsafonov at virtuozzo.com
Tue Apr 26 00:23:01 PDT 2016


On 04/26/2016 08:38 AM, Andrey Vagin wrote:
> From: Andrew Vagin <avagin at virtuozzo.com>
>
> Add linux/userfaultfd.h to criu sources. This header is a part
> of the kernel API and I see nothing wrong to have in the repo.
>
> Why we want to do this:
> * to check that criu works correctly if a kernel doesn't
>    support userfaultfd.
> * to check compilation of the userfaultfd part in travis-ci.
>
> Acked-by: Mike Rapoport <rppt at linux.vnet.ibm.com>
> Acked-by: Adrian Reber <areber at redhat.com>
> Cc: Mike Rapoport <rppt at linux.vnet.ibm.com>
> Cc: Adrian Reber <areber at redhat.com>
> Signed-off-by: Andrew Vagin <avagin at virtuozzo.com>
> ---
>   criu/arch/arm/syscalls/syscall.def         |   1 +
>   criu/arch/ppc64/syscalls/syscall-ppc64.tbl |   1 +
>   criu/arch/x86/syscalls/syscall_32.tbl      |   1 +
>   criu/arch/x86/syscalls/syscall_64.tbl      |   1 +
>   criu/include/linux/userfaultfd.h           | 167 +++++++++++++++++++++++++++++
>   criu/include/uffd.h                        |  17 +--
>   criu/pie/restorer.c                        |  11 +-
>   criu/uffd.c                                |  40 +++----
>   scripts/feature-tests.mak                  |  15 ---

As you have deleted the feature test for UFFD,
maybe you'll need this:

--->8---
diff --git a/criu/Makefile.config b/criu/Makefile.config
index 32543b494a6b..15af65f28f6b 100644
--- a/criu/Makefile.config
+++ b/criu/Makefile.config
@@ -15,7 +15,7 @@ ifeq ($(call pkg-config-check,libselinux),y)
  endif

  FEATURES_LIST  := TCP_REPAIR STRLCPY STRLCAT PTRACE_PEEKSIGINFO \
-       SETPROCTITLE_INIT MEMFD UFFD
+       SETPROCTITLE_INIT MEMFD

  # $1 - config name
  define gen-feature-test


More information about the CRIU mailing list