From patchwork Fri Apr 3 23:29:19 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masami Hiramatsu X-Patchwork-Id: 16250 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n33NUFIL021462 for ; Fri, 3 Apr 2009 23:30:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758972AbZDCX3Q (ORCPT ); Fri, 3 Apr 2009 19:29:16 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756193AbZDCX3Q (ORCPT ); Fri, 3 Apr 2009 19:29:16 -0400 Received: from mx2.redhat.com ([66.187.237.31]:47381 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753636AbZDCX3P (ORCPT ); Fri, 3 Apr 2009 19:29:15 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n33NRvDu013191; Fri, 3 Apr 2009 19:27:57 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n33NRvMI017769; Fri, 3 Apr 2009 19:27:58 -0400 Received: from [10.16.2.46] (dhcp-100-2-46.bos.redhat.com [10.16.2.46]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n33NRt9w025350; Fri, 3 Apr 2009 19:27:56 -0400 Message-ID: <49D69BCF.4080808@redhat.com> Date: Fri, 03 Apr 2009 19:29:19 -0400 From: Masami Hiramatsu User-Agent: Thunderbird 2.0.0.21 (X11/20090320) MIME-Version: 1.0 To: Roland McGrath , Ingo Molnar CC: Frederic Weisbecker , Ananth N Mavinakayanahalli , Steven Rostedt , Andrew Morton , Andi Kleen , Arnaldo Carvalho de Melo , Jim Keniston , systemtap-ml , LKML , kvm@vger.kernel.org Subject: [PATCH -tip 2/6 V4.2] x86: add arch-dep register and stack access API to ptrace References: <49D4F4DF.1040605@redhat.com> <20090402234835.GA6112@nowhere> <49D6331D.6000505@redhat.com> <20090403202004.3A2B1FC3AB@magilla.sf.frob.com> <49D680D0.1090701@redhat.com> In-Reply-To: <49D680D0.1090701@redhat.com> X-Enigmail-Version: 0.95.7 X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Add following APIs for accessing registers and stack entries from pt_regs. - query_register_offset(const char *name) Query the offset of "name" register. - query_register_name(unsigned offset) Query the name of register by its offset. - get_register(struct pt_regs *regs, unsigned offset) Get the value of a register by its offset. - valid_stack_address(struct pt_regs *regs, unsigned long addr) Check the address is in the stack. - get_stack_nth(struct pt_regs *reg, unsigned nth) Get Nth entry of the stack. (N >= 0) - get_argument_nth(struct pt_regs *reg, unsigned nth) Get Nth argument at function call. (N >= 0) changes from v4.1: - make regoffset_table constant. - remove needless local variable initialization in query_register_*. Signed-off-by: Masami Hiramatsu Cc: Steven Rostedt Cc: Ananth N Mavinakayanahalli Cc: Ingo Molnar Cc: Frederic Weisbecker Cc: Roland McGrath --- arch/x86/include/asm/ptrace.h | 66 +++++++++++++++++++++++++++++++++++++++++ arch/x86/kernel/ptrace.c | 60 +++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+), 0 deletions(-) diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h index aed0894..51e5844 100644 --- a/arch/x86/include/asm/ptrace.h +++ b/arch/x86/include/asm/ptrace.h @@ -7,6 +7,7 @@ #ifdef __KERNEL__ #include +#include #endif #ifndef __ASSEMBLY__ @@ -215,6 +216,71 @@ static inline unsigned long user_stack_pointer(struct pt_regs *regs) return regs->sp; } +/* Query offset/name of register from its name/offset */ +extern int query_register_offset(const char *name); +extern const char *query_register_name(unsigned offset); +#define MAX_REG_OFFSET (offsetof(struct pt_regs, ss)) + +/* Get register value from its offset */ +static inline unsigned long get_register(struct pt_regs *regs, unsigned offset) +{ + if (unlikely(offset > MAX_REG_OFFSET)) + return 0; + return *(unsigned long *)((unsigned long)regs + offset); +} + +/* Check the address in the stack */ +static inline int valid_stack_address(struct pt_regs *regs, unsigned long addr) +{ + return ((addr & ~(THREAD_SIZE - 1)) == + (kernel_trap_sp(regs) & ~(THREAD_SIZE - 1))); +} + +/* Get Nth entry of the stack */ +static inline unsigned long get_stack_nth(struct pt_regs *regs, unsigned n) +{ + unsigned long *addr = (unsigned long *)kernel_trap_sp(regs); + addr += n; + if (valid_stack_address(regs, (unsigned long)addr)) + return *addr; + else + return 0; +} + +/* Get Nth argument at function call */ +static inline unsigned long get_argument_nth(struct pt_regs *regs, unsigned n) +{ +#ifdef CONFIG_X86_32 +#define NR_REGPARMS 3 + if (n < NR_REGPARMS) { + switch (n) { + case 0: return regs->ax; + case 1: return regs->dx; + case 2: return regs->cx; + } + return 0; +#else /* CONFIG_X86_64 */ +#define NR_REGPARMS 6 + if (n < NR_REGPARMS) { + switch (n) { + case 0: return regs->di; + case 1: return regs->si; + case 2: return regs->dx; + case 3: return regs->cx; + case 4: return regs->r8; + case 5: return regs->r9; + } + return 0; +#endif + } else { + /* + * The typical case: arg n is on the stack. + * (Note: stack[0] = return address, so skip it) + */ + return get_stack_nth(regs, 1 + n - NR_REGPARMS); + } +} + /* * These are defined as per linux/ptrace.h, which see. */ diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index fe9345c..8a8af27 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c @@ -46,6 +46,66 @@ enum x86_regset { REGSET_IOPERM32, }; +struct pt_regs_offset { + const char *name; + int offset; +}; + +#define REG_OFFSET(r) offsetof(struct pt_regs, r) +#define REG_OFFSET_NAME(r) {.name = #r, .offset = REG_OFFSET(r)} +#define REG_OFFSET_END {.name = NULL, .offset = 0} + +static const struct pt_regs_offset regoffset_table[] = { +#ifdef CONFIG_X86_64 + REG_OFFSET_NAME(r15), + REG_OFFSET_NAME(r14), + REG_OFFSET_NAME(r13), + REG_OFFSET_NAME(r12), + REG_OFFSET_NAME(r11), + REG_OFFSET_NAME(r10), + REG_OFFSET_NAME(r9), + REG_OFFSET_NAME(r8), +#endif + REG_OFFSET_NAME(bx), + REG_OFFSET_NAME(cx), + REG_OFFSET_NAME(dx), + REG_OFFSET_NAME(si), + REG_OFFSET_NAME(di), + REG_OFFSET_NAME(bp), + REG_OFFSET_NAME(ax), +#ifdef CONFIG_X86_32 + REG_OFFSET_NAME(ds), + REG_OFFSET_NAME(es), + REG_OFFSET_NAME(fs), + REG_OFFSET_NAME(gs), +#endif + REG_OFFSET_NAME(orig_ax), + REG_OFFSET_NAME(ip), + REG_OFFSET_NAME(cs), + REG_OFFSET_NAME(flags), + REG_OFFSET_NAME(sp), + REG_OFFSET_NAME(ss), + REG_OFFSET_END, +}; + +int query_register_offset(const char *name) +{ + const struct pt_regs_offset *roff; + for (roff = regoffset_table; roff->name != NULL; roff++) + if (!strcmp(roff->name, name)) + return roff->offset; + return -EINVAL; +} + +const char *query_register_name(unsigned offset) +{ + const struct pt_regs_offset *roff; + for (roff = regoffset_table; roff->name != NULL; roff++) + if (roff->offset == offset) + return roff->name; + return NULL; +} + /* * does not yet catch signals sent when the child dies. * in exit.c or in signal.c.