On Fri, Jul 28, 2017 at 10:42:27AM -0700, Laura Abbott wrote: > On 07/28/2017 10:07 AM, Adrian Reber wrote: > > 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=20859205 > > > > 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 > > [...] > > ################## ALL TEST(S) PASSED (TOTAL 317/SKIPPED 31) ################### > > > > Signed-off-by: Adrian Reber <adrian@xxxxxxxx> > > --- > > baseconfig/s390x/CONFIG_CHECKPOINT_RESTORE | 1 + > > baseconfig/s390x/CONFIG_MEM_SOFT_DIRTY | 1 + > > kernel-s390x-debug.config | 3 ++- > > kernel-s390x.config | 3 ++- > > kernel.spec | 3 +++ > > 5 files changed, 9 insertions(+), 2 deletions(-) > > create mode 100644 baseconfig/s390x/CONFIG_CHECKPOINT_RESTORE > > create mode 100644 baseconfig/s390x/CONFIG_MEM_SOFT_DIRTY > > > > diff --git a/baseconfig/s390x/CONFIG_CHECKPOINT_RESTORE b/baseconfig/s390x/CONFIG_CHECKPOINT_RESTORE > > new file mode 100644 > > index 00000000..c554a09c > > --- /dev/null > > +++ b/baseconfig/s390x/CONFIG_CHECKPOINT_RESTORE > > @@ -0,0 +1 @@ > > +CONFIG_CHECKPOINT_RESTORE=y > > diff --git a/baseconfig/s390x/CONFIG_MEM_SOFT_DIRTY b/baseconfig/s390x/CONFIG_MEM_SOFT_DIRTY > > new file mode 100644 > > index 00000000..356f2edd > > --- /dev/null > > +++ b/baseconfig/s390x/CONFIG_MEM_SOFT_DIRTY > > @@ -0,0 +1 @@ > > +CONFIG_MEM_SOFT_DIRTY=y > > diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config > > index a69ba347..25977b5f 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 > > @@ -2573,6 +2573,7 @@ CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y > > CONFIG_MEMORY_HOTPLUG=y > > CONFIG_MEMORY_HOTREMOVE=y > > # CONFIG_MEMORY is not set > > +CONFIG_MEM_SOFT_DIRTY=y > > # CONFIG_MEMSTICK_DEBUG is not set > > # CONFIG_MEMSTICK is not set > > CONFIG_MEMSTICK_JMICRON_38X=m > > diff --git a/kernel-s390x.config b/kernel-s390x.config > > index 870bed49..7f0886fc 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 > > @@ -2552,6 +2552,7 @@ CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y > > CONFIG_MEMORY_HOTPLUG=y > > CONFIG_MEMORY_HOTREMOVE=y > > # CONFIG_MEMORY is not set > > +CONFIG_MEM_SOFT_DIRTY=y > > # CONFIG_MEMSTICK_DEBUG is not set > > # CONFIG_MEMSTICK is not set > > CONFIG_MEMSTICK_JMICRON_38X=m > > diff --git a/kernel.spec b/kernel.spec > > index 9ece7387..4832501e 100644 > > --- a/kernel.spec > > +++ b/kernel.spec > > @@ -2195,6 +2195,9 @@ fi > > # > > # > > %changelog > > +* Fri Jul 28 2017 Adrian Reber <adrian@xxxxxxxx> > > +- Enable CHECKPOINT_RESTORE on s390x > > + > > * Fri Jul 28 2017 Laura Abbott <labbott@xxxxxxxxxxxxxxxxx> - 4.13.0-0.rc2.git3.1 > > - Linux v4.13-rc2-110-g0b5477d9dabd > > > > Thanks, applied to rawhide. I think that not all parts of my patch have been applied. The following part is not in git: diff --git a/baseconfig/s390x/CONFIG_CHECKPOINT_RESTORE b/baseconfig/s390x/CONFIG_CHECKPOINT_RESTORE new file mode 100644 index 00000000..c554a09c --- /dev/null +++ b/baseconfig/s390x/CONFIG_CHECKPOINT_RESTORE @@ -0,0 +1 @@ +CONFIG_CHECKPOINT_RESTORE=y diff --git a/baseconfig/s390x/CONFIG_MEM_SOFT_DIRTY b/baseconfig/s390x/CONFIG_MEM_SOFT_DIRTY new file mode 100644 index 00000000..356f2edd --- /dev/null +++ b/baseconfig/s390x/CONFIG_MEM_SOFT_DIRTY @@ -0,0 +1 @@ +CONFIG_MEM_SOFT_DIRTY=y Running ./build_configs.sh removes the CHECKPOINT_RESTORE option again from the configs. The same happens also for CONFIG_AQTION. This is also gone after running ./build_configs.sh. Adrian _______________________________________________ kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
