Skip to contentSkip to conversation

c/r: define s390-specific checkpoint-restart code

PATCH In review Serge E. Hallyn 2 participants 3 messages Jan 16, 2009 – Jan 28, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 c/r: define s390-specific checkpoint-restart code

Implement the s390 arch-specific checkpoint/restart helpers. This is on top of Oren Laadan's c/r code (which so far was x86_32-only) submitted here: http://lkml.org/lkml/2008/12/29/38, plus two more patches by Nathan Lynch to fix some 64-bit issues (see
https://lists.linux-foundation.org/pipermail/containers/2009-January/015313.html
and
https://lists.linux-foundation.org/pipermail/containers/2009-January/015314.html
).

With these, I am able to checkpoint and restart simple programs as per Oren's patch intro. While on x86 I never had to freeze a single task to checkpoint it, on s390 I do need to. That is a prereq for consistent snapshots (esp with multiple processes) anyway so I don't see that as a problem.

Oren, should we be putting a byte at the front of the format to specify the architecture?

Changelog:
Jan 15: Stopped restoring ksp and vdso_base

---
 arch/s390/include/asm/checkpoint_hdr.h |   59 +++++++++++++++
 arch/s390/include/asm/unistd.h         |    4 -
 arch/s390/kernel/compat_wrapper.S      |   12 +++
 arch/s390/kernel/syscalls.S            |    2 
 arch/s390/mm/Makefile                  |    1 
 arch/s390/mm/checkpoint.c              |  122 +++++++++++++++++++++++++++++++++
 checkpoint/Kconfig                     |    2 
 checkpoint/checkpoint.c                |    2 
 checkpoint/restart.c                   |    2 
 9 files changed, 204 insertions(+), 2 deletions(-)
 create mode 100644 arch/s390/include/asm/checkpoint_hdr.h
 create mode 100644 arch/s390/mm/checkpoint.c
arch/s390/include/asm/checkpoint_hdr.h new file +59 -0
new file mode 100644
index 0000000..3029923
@@ -0,0 +1,59 @@
+#ifndef __ASM_S390_CKPT_HDR_H
+#define __ASM_S390_CKPT_HDR_H
+/*
+ *  Checkpoint/restart - architecture specific headers s/390
+ *
+ *  Copyright (C) 2008 Oren Laadan
+ *
+ *  This file is subject to the terms and conditions of the GNU General Public
+ *  License.  See the file COPYING in the main directory of the Linux
+ *  distribution for more details.
+ */
+
+#include <linux/types.h>
+
+/*
+ * To maintain compatibility between 32-bit and 64-bit architecture flavors,
+ * keep data 64-bit aligned: use padding for structure members, and use
+ * __attribute__((aligned (8))) for the entire structure.
+ *
+ * Quoting Arnd Bergmann:
+ *   "This structure has an odd multiple of 32-bit members, which means
+ *   that if you put it into a larger structure that also contains 64-bit
+ *   members, the larger structure may get different alignment on x86-32
+ *   and x86-64, which you might want to avoid. I can't tell if this is
+ *   an actual problem here. ... In this case, I'm pretty sure that
+ *   sizeof(cr_hdr_task) on x86-32 is different from x86-64, since it
+ *   will be 32-bit aligned on x86-32."
+ */
+
+#ifdef __KERNEL__
+#include <asm/processor.h>
+#else
+#include <sys/user.h>
+#endif
+
+/*
+ * Notes
+ * NUM_GPRS defined in <asm/ptrace.h> to be 16
+ * NUM_FPRS defined in <asm/ptrace.h> to be 16
+ * NUM_APRS defined in <asm/ptrace.h> to be 16
+ */
+struct cr_hdr_cpu {
+	psw_t psw;
+	unsigned long args[1];
+	s390_fp_regs fp_regs;
+	unsigned long gprs[NUM_GPRS];
+	unsigned long orig_gpr2;
+	unsigned short svcnr;
+	unsigned short ilc;
+	unsigned int acrs[NUM_ACRS];
+	unsigned long ksp;
+	unsigned long prot_addr;
+	unsigned int trap_no;
+	per_struct per_info;
+	unsigned long ieee_instruction_pointer;
+	unsigned long pfault_wait;
+};
+
+#endif /* __ASM_S390_CKPT_HDR__H */
arch/s390/include/asm/unistd.h +3 -1
index c8ad350..ffe64a0 100644
@@ -265,7 +265,9 @@
 #define __NR_pipe2		325
 #define __NR_dup3		326
 #define __NR_epoll_create1	327
-#define NR_syscalls 328
+#define __NR_checkpoint		328
+#define __NR_restart		329
+#define NR_syscalls 330
 
 /* 
  * There are some system calls that are not present on 64 bit, some
arch/s390/kernel/compat_wrapper.S +12 -0
index fc2c971..9546a81 100644
@@ -1767,3 +1767,15 @@ sys_dup3_wrapper:
 sys_epoll_create1_wrapper:
 	lgfr	%r2,%r2			# int
 	jg	sys_epoll_create1	# branch to system call
+
+	.globl sys_checkpoint_wrapper
+sys_checkpoint_wrapper:
+	lgfr	%r2,%r2			# pid_t
+	lgfr	%r3,%r3			# int
+	llgfr	%r4,%r4			# unsigned long
+
+	.globl sys_restart_wrapper
+sys_restart_wrapper:
+	lgfr	%r2,%r2			# int
+	lgfr	%r3,%r3			# int
+	llgfr	%r4,%r4			# unsigned long
arch/s390/kernel/syscalls.S +2 -0
index 2d61787..54316c8 100644
@@ -336,3 +336,5 @@ SYSCALL(sys_inotify_init1,sys_inotify_init1,sys_inotify_init1_wrapper)
 SYSCALL(sys_pipe2,sys_pipe2,sys_pipe2_wrapper) /* 325 */
 SYSCALL(sys_dup3,sys_dup3,sys_dup3_wrapper)
 SYSCALL(sys_epoll_create1,sys_epoll_create1,sys_epoll_create1_wrapper)
+SYSCALL(sys_checkpoint,sys_checkpoint,sys_checkpoint_wrapper)
+SYSCALL(sys_restart,sys_restart,sys_restart_wrapper)
arch/s390/mm/Makefile +1 -0
index 2a74581..b3f0f32 100644
@@ -6,3 +6,4 @@ obj-y	 := init.o fault.o extmem.o mmap.o vmem.o pgtable.o
 obj-$(CONFIG_CMM) += cmm.o
 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
 obj-$(CONFIG_PAGE_STATES) += page-states.o
+obj-$(CONFIG_CHECKPOINT_RESTART) += checkpoint.o
arch/s390/mm/checkpoint.c new file +122 -0

122 lines not on this page · raw message

checkpoint/Kconfig +1 -1
index ffaa635..31e7594 100644
@@ -1,7 +1,7 @@
 config CHECKPOINT_RESTART
 	prompt "Enable checkpoint/restart (EXPERIMENTAL)"
 	def_bool n
-	depends on X86_32 && EXPERIMENTAL
+	depends on (X86_32 || S390) && EXPERIMENTAL
 	help
 	  Application checkpoint/restart is the ability to save the
 	  state of a running application so that it can later resume
checkpoint/checkpoint.c +2 -0
index fbcd9eb..06e15fc 100644
@@ -8,6 +8,8 @@
  *  distribution for more details.
  */
 
+#define DEBUG 1
+
 #include <linux/version.h>
 #include <linux/sched.h>
 #include <linux/ptrace.h>
checkpoint/restart.c +2 -0
index 6b4cd75..f65a63e 100644
@@ -8,6 +8,8 @@
  *  distribution for more details.
  */
 
+#define DEBUG 1
+
 #include <linux/version.h>
 #include <linux/sched.h>
 #include <linux/wait.h>
#1 lore raw
Quoted 1 line · Serge E. Hallyn

Implement the s390 arch-specific checkpoint/restart helpers. This

Thanks for the patch.

I will assume that the s390 specifics are correct...

Quoted 7 lines

is on top of Oren Laadan's c/r code (which so far was x86_32-only) submitted here: http://lkml.org/lkml/2008/12/29/38, plus two more patches by Nathan Lynch to fix some 64-bit issues (see
https://lists.linux-foundation.org/pipermail/containers/2009-January/015313.html
and
https://lists.linux-foundation.org/pipermail/containers/2009-January/015314.html
).

ckpt-v13 already has these two fixed.

Quoted 9 lines

With these, I am able to checkpoint and restart simple programs as per Oren's patch intro. While on x86 I never had to freeze a single task to checkpoint it, on s390 I do need to. That is a prereq for consistent snapshots (esp with multiple processes) anyway so I don't see that as a problem.

Oren, should we be putting a byte at the front of the format to specify the architecture?

If we add a field to 'struct cr_hdr_head', then we'll need arch-dependent code in a non-arch dependent source, to ensure that no two architectures choose the same value as an identifier.

Can we not use the 'machine' string fiels in 'struct cr_hdr_head' - and then additional classification can take place in cr_read/write_head_arch() ?

Quoted 3 lines

Changelog:
Jan 15: Stopped restoring ksp and vdso_base

[...]

Quoted 12 lines
arch/s390/include/asm/checkpoint_hdr.h new file +12 -0
+/*
+ * Notes
+ * NUM_GPRS defined in <asm/ptrace.h> to be 16
+ * NUM_FPRS defined in <asm/ptrace.h> to be 16
+ * NUM_APRS defined in <asm/ptrace.h> to be 16
+ */
+struct cr_hdr_cpu {
+	psw_t psw;
+	unsigned long args[1];
+	s390_fp_regs fp_regs;
+	unsigned long gprs[NUM_GPRS];
+	unsigned long orig_gpr2;

arch/s390/include/asm/checkpoint_hdr.h line 57

Quoted 10 lines
arch/s390/include/asm/checkpoint_hdr.h new file +10 -0
+	unsigned short svcnr;
+	unsigned short ilc;
+	unsigned int acrs[NUM_ACRS];
+	unsigned long ksp;
+	unsigned long prot_addr;
+	unsigned int trap_no;
+	per_struct per_info;
+	unsigned long ieee_instruction_pointer;
+	unsigned long pfault_wait;
+};

This header file will be included from user space, e.g. by a utility to convert image format between kernel versions. For that, and for 32/64 bit compatibility (while shouldn't be an issue with s390...), please
substitue: '__u64' for 'unsigned long', etc, and avoid including an
entire structure as is.

Quoted 2 lines
(quoted diff) +2 -0
+
+#endif /* __ASM_S390_CKPT_HDR__H */

[...]

Quoted 13 lines

*/

checkpoint/checkpoint.c +2 -0
+#define DEBUG 1
+
 #include <linux/version.h>
 #include <linux/sched.h>
 #include <linux/ptrace.h>
checkpoint/restart.c +0 -0
index 6b4cd75..f65a63e 100644

checkpoint/restart.c line 15

Quoted 8 lines
checkpoint/restart.c +2 -0
@@ -8,6 +8,8 @@
  *  distribution for more details.
  */
 
+#define DEBUG 1
+
 #include <linux/version.h>
 #include <linux/sched.h>
 #include <linux/wait.h>

Probably unrelated ?

Thanks,

Oren.

#2 lore raw
Quoted 29 lines · Oren Laadan
Quoted 1 line · Serge E. Hallyn

Implement the s390 arch-specific checkpoint/restart helpers. This

Thanks for the patch.

I will assume that the s390 specifics are correct...

Quoted 7 lines

is on top of Oren Laadan's c/r code (which so far was x86_32-only) submitted here: http://lkml.org/lkml/2008/12/29/38, plus two more patches by Nathan Lynch to fix some 64-bit issues (see
https://lists.linux-foundation.org/pipermail/containers/2009-January/015313.html
and
https://lists.linux-foundation.org/pipermail/containers/2009-January/015314.html
).

ckpt-v13 already has these two fixed.

Quoted 9 lines

With these, I am able to checkpoint and restart simple programs as per Oren's patch intro. While on x86 I never had to freeze a single task to checkpoint it, on s390 I do need to. That is a prereq for consistent snapshots (esp with multiple processes) anyway so I don't see that as a problem.

Oren, should we be putting a byte at the front of the format to specify the architecture?

Quoted 6 lines

If we add a field to 'struct cr_hdr_head', then we'll need arch-dependent code in a non-arch dependent source, to ensure that no two architectures choose the same value as an identifier.

Can we not use the 'machine' string fiels in 'struct cr_hdr_head' - and then additional classification can take place in cr_read/write_head_arch() ?

Huh, yes, I somehow missed that.

Quoted 13 lines
Quoted 13 lines
checkpoint/checkpoint.c +2 -0
+#define DEBUG 1
+
 #include <linux/version.h>
 #include <linux/sched.h>
 #include <linux/ptrace.h>
checkpoint/restart.c +0 -0
index 6b4cd75..f65a63e 100644
@@ -8,6 +8,8 @@
  *  distribution for more details.
  */
 
Quoted 8 lines

checkpoint/restart.c line 15

Quoted 6 lines
checkpoint/restart.c +2 -0
+#define DEBUG 1
+
 #include <linux/version.h>
 #include <linux/sched.h>
 #include <linux/wait.h>

Probably unrelated ?

Yup. Will send a new version inc. your changes and against v13 later this week.

thanks,
-serge