[Devel] Re: [PATCH] c/r: define s390-specific checkpoint-restart code (v4)
Dave Hansen
dave at linux.vnet.ibm.com
Mon Feb 23 14:31:09 PST 2009
On Mon, 2009-02-23 at 16:39 -0500, Dan Smith wrote:
> +#define CR_390_PACK_TRACE_FLAGS(hdr, thread) \
> + do { \
> + hdr->em_instr = 0; \
> + if (thread->per_info.single_step) \
> + hdr->em_instr |= 1; \
> + if (thread->per_info.instruction_fetch) \
> + hdr->em_instr |= 2; \
> +} while (0)
> +
> +#define CR_390_UNPACK_TRACE_FLAGS(hdr, thread) \
> + do { \
> + if (hdr->em_instr & 1) \
> + thread->per_info.single_step = 1; \
> + if (hdr->em_instr & 2) \
> + thread->per_info.instruction_fetch = 1; \
> + } while (0)
Why are these macros?
Why do we need to pack them, anyway?
> +/*
> + * 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 {
> + __u64 args[1];
> + __u64 gprs[NUM_GPRS];
> + __u64 orig_gpr2;
> + __u16 svcnr;
> + __u16 ilc;
> + __u32 acrs[NUM_ACRS];
> + __u64 ieee_instruction_pointer;
> +
> + /* psw_t */
> + __u64 psw_t_mask;
> + __u64 psw_t_addr;
> +
> + /* s390_fp_regs_t */
> + __u32 fpc;
> + struct {
> + float f;
> + double d;
> + __u64 ui;
> + __u32 fp_hi;
> + __u32 fp_lo;
> + } fprs[NUM_FPRS];
I don't see a lot of floating point code go by, so I'm a bit stupid on
this. But, this doesn't make a lot of sense to me. Are there really
parallel sets of float and double registers? Or, do we want some kind
of union here?
> + /* per_struct */
> + __u64 per_control_regs[3];
> + __u32 em_instr;
> + __u64 starting_addr;
> + __u64 ending_addr;
> + __u16 perc_atmid;
> + __u64 address;
> + __u8 access_id;
> +};
> +
> +struct cr_hdr_mm_context {
> + unsigned long vdso_base;
> + int noexec;
> + int has_pgste;
> + int alloc_pgste;
> + unsigned long asce_bits;
> + unsigned long asce_limit;
> +};
> +
> +struct cr_hdr_head_arch {
> +};
> +#endif /* __s390x__ */
> +
> +#endif /* __ASM_S390_CKPT_HDR__H */
> diff --git a/arch/s390/include/asm/unistd.h b/arch/s390/include/asm/unistd.h
> index c8ad350..ffe64a0 100644
> --- a/arch/s390/include/asm/unistd.h
> +++ b/arch/s390/include/asm/unistd.h
> @@ -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
> diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S
> index fc2c971..9546a81 100644
> --- a/arch/s390/kernel/compat_wrapper.S
> +++ b/arch/s390/kernel/compat_wrapper.S
> @@ -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
So, all s390 syscalls need these wrappers? They don't do anything in
particular to help c/r, right?
> +static void cr_save_cpu_regs(struct cr_hdr_cpu *hh, struct task_struct *t)
> +{
> + struct thread_struct *thread = &t->thread;
> + struct pt_regs *regs = task_pt_regs(t);
> +
> + hh->fpc = thread->fp_regs.fpc;
> + memcpy(&hh->fprs, &thread->fp_regs.fprs, NUM_FPRS*sizeof(freg_t));
> + memcpy(hh->acrs, &thread->acrs[0], NUM_ACRS * sizeof(unsigned int));
One minor issue with all of these memcpy()s is that they're not
stupid-proof. To figure out whether the 'sizeof(unsigned int)' is
correct, I need to go back and look to ensure that hh->acrs is, in fact,
an 'unsigned int'. But if you do:
memcpy(hh->acrs, &thread->acrs[0], sizeof(hh->acrs));
it will always be right unless you turn hh->acrs into a plain pointer.
But, even if you change the type to, say, a u64 or something, it will
continue to work.
> + hh->psw_t_mask = regs->psw.mask;
> + hh->psw_t_addr = regs->psw.addr;
> +
> + hh->args[0] = regs->args[0];
Why is this an array?
> + hh->svcnr = regs->svcnr;
> + hh->ilc = regs->ilc;
> + memcpy(hh->gprs, regs->gprs, NUM_GPRS*sizeof(unsigned long));
> + hh->orig_gpr2 = regs->orig_gpr2;
> +
> + hh->ieee_instruction_pointer = thread->ieee_instruction_pointer;
> +
> + /* per_info */
> + memcpy(&hh->per_control_regs, &thread->per_info.control_regs.words,
> + 3 * sizeof(unsigned long));
This '3' is a magic number and is used in a few places. Does it make
sense to define it as a variable.
> + CR_390_PACK_TRACE_FLAGS(hh, thread);
> + hh->starting_addr = thread->per_info.starting_addr;
> + hh->ending_addr = thread->per_info.ending_addr;
> + hh->perc_atmid = thread->per_info.lowcore.words.perc_atmid;
> + hh->address = thread->per_info.lowcore.words.address;
> + hh->access_id = thread->per_info.lowcore.words.access_id;
> +}
> +
> +/* dump the cpu state and registers of a given task */
> +int cr_write_cpu(struct cr_ctx *ctx, struct task_struct *t)
> +{
> + struct cr_hdr h;
> + struct cr_hdr_cpu *hh = cr_hbuf_get(ctx, sizeof(*hh));
> + int ret;
> +
> + h.type = CR_HDR_CPU;
> + h.len = sizeof(*hh);
> + h.parent = task_pid_vnr(t);
I'm starting to think we need a macro for this or something. We repeat
these three lines of code way too often.
> + cr_save_cpu_regs(hh, t);
> +
> + ret = cr_write_obj(ctx, &h, hh);
> + cr_hbuf_put(ctx, sizeof(*hh));
> + WARN_ON_ONCE(ret < 0);
> +
> + return ret;
> +}
The WARN_ON() probably shouldn't be there when this is submitted.
> +int cr_write_head_arch(struct cr_ctx *ctx)
> +{
> + return 0;
> +}
> +
> +/* Nothing to do for mm context state */
> +int cr_write_mm_context(struct cr_ctx *ctx, struct mm_struct *mm, int parent)
> +{
> + struct cr_hdr h;
> + struct cr_hdr_mm_context *hh = cr_hbuf_get(ctx, sizeof(*hh));
> + int ret;
> +
> + h.type = CR_HDR_MM_CONTEXT;
> + h.len = sizeof(*hh);
> + h.parent = parent;
> +
> +#if 0
> + /* Oren's v13 is on an older kernel which has no vdso_base */
> + /* on newer kernel, we'll have to enable this */
> + hh->vdso_base = mm->context.vdso_base;
> + pr_debug(KERN_NOTICE "checkpointing vdso_base %lx\n", hh->vdso_base);
> +#else
> + hh->vdso_base = 0;
> +#endif
> + hh->noexec = mm->context.noexec;
> + hh->has_pgste = mm->context.has_pgste;
> + hh->alloc_pgste = mm->context.alloc_pgste;
> + hh->asce_bits = mm->context.asce_bits;
> + hh->asce_limit = mm->context.asce_limit;
> +
> + ret = cr_write_obj(ctx, &h, hh);
> + cr_hbuf_put(ctx, sizeof(*hh));
> +
> + return ret;
> +}
> diff --git a/arch/s390/mm/restart.c b/arch/s390/mm/restart.c
> new file mode 100644
> index 0000000..32b1b15
> --- /dev/null
> +++ b/arch/s390/mm/restart.c
> @@ -0,0 +1,117 @@
> +/*
> + * Checkpoint/restart - architecture specific support for s390
> + *
> + * Copyright IBM Corp. 2009
> + *
> + * 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/checkpoint.h>
> +#include <linux/checkpoint_hdr.h>
> +#include <linux/kernel.h>
> +#include <asm/system.h>
> +#include <asm/pgtable.h>
> +
> +int cr_read_thread(struct cr_ctx *ctx)
> +{
> + return 0;
> +}
> +
> +int cr_read_cpu(struct cr_ctx *ctx)
> +{
> + struct cr_hdr_cpu *hh = cr_hbuf_get(ctx, sizeof(*hh));
> + struct thread_struct *thread = ¤t->thread;
> + struct pt_regs *regs = task_pt_regs(current);
> + int parent, ret;
> +
> + parent = cr_read_obj_type(ctx, hh, sizeof(*hh), CR_HDR_CPU);
> + if (parent < 0) {
> + ret = parent;
> + goto out;
> + }
> + ret = 0;
> +
> + regs->psw.addr &= ~PSW_ADDR_INSN;
> + regs->psw.addr |= hh->psw_t_addr & PSW_ADDR_INSN;
> +
> + regs->args[0] = hh->args[0];
> +
> + /* ilc is syscall restart addr. it looks like we must
> + restore it since we restore psw.addr */
Don't forget CodingStyle on these, please.
> + regs->ilc = hh->ilc;
> + memcpy(regs->gprs, hh->gprs, NUM_GPRS*sizeof(unsigned long));
> + regs->orig_gpr2 = hh->orig_gpr2;
> + /* svcnr is the current system call. but it's on ptregs so
> + restore it */
> + regs->svcnr = hh->svcnr;
> +
> + memcpy(thread->acrs, hh->acrs, NUM_ACRS * sizeof(unsigned int));
> + restore_access_regs(thread->acrs);
> +
> + /* ieee_instruction_pointer points to a faulting address
> + on FPE. restore it (for ptrace) */
> + thread->ieee_instruction_pointer = hh->ieee_instruction_pointer;
> +
> + /* s390_fp_regs_t */
> + thread->fp_regs.fpc = hh->fpc;
> + memcpy(&thread->fp_regs.fprs, &hh->fprs, NUM_FPRS*sizeof(freg_t));
> +
> + /* per_struct - restore it */
> + memcpy(&thread->per_info.control_regs.words, &hh->per_control_regs,
> + 3 * sizeof(unsigned long));
> + CR_390_UNPACK_TRACE_FLAGS(hh, thread);
> + thread->per_info.starting_addr = hh->starting_addr;
> + thread->per_info.ending_addr = hh->ending_addr;
> + thread->per_info.lowcore.words.perc_atmid = hh->perc_atmid;
> + thread->per_info.lowcore.words.address = hh->address;
> + thread->per_info.lowcore.words.access_id = hh->access_id;
> +
> +out:
> + cr_hbuf_put(ctx, sizeof(*hh));
> + return ret;
> +}
> +
I'm struggling to figure out how we're going to keep up with keeping
checkpoint and restart synchronized. This is all pretty mindless
copying in both directions. Is it possible and worthwhile for us to
just define it once, but use it for both checkpoint and restart with
some macro trickery?
#define CKPT 1
#define RST 2
#define CR_COPY(op, a, b)
do {
WARN_ON(sizeof(a) != sizeof(b));
if (op == CKPT)
memcpy(&a, &b, sizeof(b));
else
memcpy(&b, &a, sizeof(b));
} while (0);
void s390_cr_regs(int op, struct task_struct *thread, *hh)
{
CR_COPY(op, thread->per_info.lowcore.words.perc_atmid, hh->perc_atmid);
CR_COPY(op, thread->per_info.lowcore.words.address, hh->address);
CR_COPY(op, thread->per_info.lowcore.words.access_id, hh->access_id);
...
}
int cr_read_cpu(struct cr_ctx *ctx)
{
s390_cr_regs(RST, thread, hh);
}
int cr_save_cpu(struct cr_ctx *ctx)
{
s390_cr_regs(CKPT, thread, hh);
}
That works for both regular variables and for arrays. Is the decreased
line count worth the weirdo non-standard abstraction?
-- Dave
_______________________________________________
Containers mailing list
Containers at lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/containers
More information about the Devel
mailing list