[PATCH] enable CHECKPOINT_RESTORE on s390x
Bugzilla:
https://bugzilla.redhat.com/show_bug.cgi?id=1475719
Fedora - Add new package CRIU for Docker on z Systems
Koji: https://koji.fedoraproject.org/koji/taskinfo?taskID=20844822
Testing:
The kernel from koji was used to run the CRIU test suite (zdtm)
on a RHEL s390x system. The kernel was started using kexec.
# ./zdtm.py run -a --keep-going
[...]
################### 1 TEST(S) FAILED (TOTAL 317/SKIPPED 34) ####################
* zdtm/static/socket-tcp-nfconntrack(h)
##################################### FAIL #####################################
The are always tests which can fail in the CRIU test suite and this one
fails during the following command:
# iptables -w -A INPUT -i lo -p tcp -m state --state NEW,ESTABLISHED -j ACCEPT
iptables: No chain/target/match by that name.
So this failure seems to be unrelated to the actual checkpointing feature of
CRIU.
Signed-off-by: Adrian Reber <adrian(a)lisas.de>
---
kernel-s390x-debug.config | 3 ++-
kernel-s390x.config | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index a69ba347..c89c3196 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -654,7 +654,7 @@ CONFIG_CGROUPS=y
# CONFIG_CHARGER_RT9455 is not set
# CONFIG_CHARGER_SBS is not set
# CONFIG_CHARGER_SMB347 is not set
-# CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_CHECKPOINT_RESTORE=y
CONFIG_CHECK_STACK=y
CONFIG_CHELSIO_T1_1G=y
CONFIG_CHELSIO_T1=m
@@ -2582,6 +2582,7 @@ CONFIG_MEMSTICK_REALTEK_USB=m
CONFIG_MEMSTICK_TIFM_MS=m
# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
# CONFIG_MEMTEST is not set
+CONFIG_MEM_SOFT_DIRTY=y
# CONFIG_MEN_A21_WDT is not set
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_88PM800 is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 870bed49..7e7ae3ae 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -653,7 +653,7 @@ CONFIG_CGROUPS=y
# CONFIG_CHARGER_RT9455 is not set
# CONFIG_CHARGER_SBS is not set
# CONFIG_CHARGER_SMB347 is not set
-# CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_CHECKPOINT_RESTORE=y
CONFIG_CHECK_STACK=y
CONFIG_CHELSIO_T1_1G=y
CONFIG_CHELSIO_T1=m
@@ -2561,6 +2561,7 @@ CONFIG_MEMSTICK_REALTEK_USB=m
CONFIG_MEMSTICK_TIFM_MS=m
# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
# CONFIG_MEMTEST is not set
+CONFIG_MEM_SOFT_DIRTY=y
# CONFIG_MEN_A21_WDT is not set
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_88PM800 is not set
--
2.13.3