Skip to contentSkip to conversation

s390: add pt_regs register and stack access API

PATCH Applied Heiko Carstens 2 participants 5 messages Feb 10, 2010 – Feb 27, 2010

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

PATCH 2/2 s390: add pt_regs register and stack access API

From: Heiko Carstens <[email protected]>

This API is needed for the kprobe-based event tracer.

---
 arch/s390/Kconfig              |    1 
 arch/s390/include/asm/ptrace.h |   14 +++++++
 arch/s390/kernel/ptrace.c      |   76 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 90 insertions(+), 1 deletion(-)
arch/s390/include/asm/ptrace.h +13 -1
@@ -492,13 +492,25 @@ struct user_regs_struct
 struct task_struct;
 extern void user_enable_single_step(struct task_struct *);
 extern void user_disable_single_step(struct task_struct *);
+extern void show_regs(struct pt_regs * regs);
 
 #define user_mode(regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0)
 #define instruction_pointer(regs) ((regs)->psw.addr & PSW_ADDR_INSN)
 #define user_stack_pointer(regs)((regs)->gprs[15])
 #define regs_return_value(regs)((regs)->gprs[2])
 #define profile_pc(regs) instruction_pointer(regs)
-extern void show_regs(struct pt_regs * regs);
+
+int regs_query_register_offset(const char *name);
+const char *regs_query_register_name(unsigned int offset);
+unsigned long regs_get_argument_nth(struct pt_regs *regs, unsigned int n);
+unsigned long regs_get_register(struct pt_regs *regs, unsigned int offset);
+unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, unsigned int n);
+
+static inline unsigned long kernel_stack_pointer(struct pt_regs *regs)
+{
+	return regs->gprs[15] & PSW_ADDR_INSN;
+}
+
 #endif /* __KERNEL__ */
 #endif /* __ASSEMBLY__ */
 
arch/s390/Kconfig +1 -0
@@ -87,6 +87,7 @@ config S390
 	select HAVE_SYSCALL_TRACEPOINTS
 	select HAVE_DYNAMIC_FTRACE
 	select HAVE_FUNCTION_GRAPH_TRACER
+	select HAVE_REGS_AND_STACK_ACCESS_API
 	select HAVE_DEFAULT_NO_SPIN_MUTEXES
 	select HAVE_OPROFILE
 	select HAVE_KPROBES
arch/s390/kernel/ptrace.c +76 -0

79 lines not on this page · raw message

#1 lore raw
Quoted 19 lines · Heiko Carstens

From: Heiko Carstens <[email protected]>

This API is needed for the kprobe-based event tracer.

---
 arch/s390/Kconfig              |    1 
 arch/s390/include/asm/ptrace.h |   14 +++++++
 arch/s390/kernel/ptrace.c      |   76 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 90 insertions(+), 1 deletion(-)
arch/s390/include/asm/ptrace.h +1 -0
@@ -492,13 +492,25 @@ struct user_regs_struct
 struct task_struct;
 extern void user_enable_single_step(struct task_struct *);
 extern void user_disable_single_step(struct task_struct *);
+extern void show_regs(struct pt_regs * regs);
 

arch/s390/include/asm/ptrace.h struct user_regs_struct · line 505

Quoted 10 lines
arch/s390/include/asm/ptrace.h +4 -1
 #define user_mode(regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0)
 #define instruction_pointer(regs) ((regs)->psw.addr & PSW_ADDR_INSN)
 #define user_stack_pointer(regs)((regs)->gprs[15])
 #define regs_return_value(regs)((regs)->gprs[2])
 #define profile_pc(regs) instruction_pointer(regs)
-extern void show_regs(struct pt_regs * regs);
+
+int regs_query_register_offset(const char *name);
+const char *regs_query_register_name(unsigned int offset);
+unsigned long regs_get_argument_nth(struct pt_regs *regs, unsigned int n);

Hmm, the latest kprobe-tracer on -tip/master doesn't support regs_get_argument_nth() anymore, because the function ABI strongly depends on each function interface, compile option etc. So I removed it (14640106f243a3b29944d7198569090fa6546f2d and aa5add93e92019018e905146f8c3d3f8e3c08300).

Yeah, those patches are still on -tip tree. Since I'm working on -tip/master for kprobe-tracer etc., please work on -tip tree.

Thank you!

Signature · 7 lines
Masami Hiramatsu

Software Engineer
Hitachi Computer Products (America), Inc.
Software Solutions Division

e-mail: [email protected]
#2 lore raw
Quoted 10 lines · Masami Hiramatsu

Review

Quoted 3 lines
(quoted diff) +3 -0
+int regs_query_register_offset(const char *name);
+const char *regs_query_register_name(unsigned int offset);
+unsigned long regs_get_argument_nth(struct pt_regs *regs, unsigned int n);

Hmm, the latest kprobe-tracer on -tip/master doesn't support regs_get_argument_nth() anymore, because the function ABI strongly depends on each function interface, compile option etc. So I removed it (14640106f243a3b29944d7198569090fa6546f2d and aa5add93e92019018e905146f8c3d3f8e3c08300).

Quoted 2 lines

Yeah, those patches are still on -tip tree. Since I'm working on -tip/master for kprobe-tracer etc., please work on -tip tree.

Ok, here is an updated patch without regs_get_argument_nth:

Subject: [PATCH] s390: add pt_regs register and stack access API

From: Heiko Carstens <[email protected]>

This API is needed for the kprobe-based event tracer.

Cc Martin Schwidefsky <[email protected]>
---
 arch/s390/Kconfig              |    1 
 arch/s390/include/asm/ptrace.h |   13 ++++++++-
 arch/s390/kernel/ptrace.c      |   58 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+), 1 deletion(-)
arch/s390/include/asm/ptrace.h +12 -1
@@ -492,13 +492,24 @@ struct user_regs_struct
 struct task_struct;
 extern void user_enable_single_step(struct task_struct *);
 extern void user_disable_single_step(struct task_struct *);
+extern void show_regs(struct pt_regs * regs);
 
 #define user_mode(regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0)
 #define instruction_pointer(regs) ((regs)->psw.addr & PSW_ADDR_INSN)
 #define user_stack_pointer(regs)((regs)->gprs[15])
 #define regs_return_value(regs)((regs)->gprs[2])
 #define profile_pc(regs) instruction_pointer(regs)
-extern void show_regs(struct pt_regs * regs);
+
+int regs_query_register_offset(const char *name);
+const char *regs_query_register_name(unsigned int offset);
+unsigned long regs_get_register(struct pt_regs *regs, unsigned int offset);
+unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, unsigned int n);
+
+static inline unsigned long kernel_stack_pointer(struct pt_regs *regs)
+{
+	return regs->gprs[15] & PSW_ADDR_INSN;
+}
+
 #endif /* __KERNEL__ */
 #endif /* __ASSEMBLY__ */
 
arch/s390/Kconfig +1 -0
@@ -90,6 +90,7 @@ config S390
 	select HAVE_SYSCALL_TRACEPOINTS
 	select HAVE_DYNAMIC_FTRACE
 	select HAVE_FUNCTION_GRAPH_TRACER
+	select HAVE_REGS_AND_STACK_ACCESS_API
 	select HAVE_DEFAULT_NO_SPIN_MUTEXES
 	select HAVE_OPROFILE
 	select HAVE_KPROBES
arch/s390/kernel/ptrace.c +58 -0

61 lines not on this page · raw message

Reviewed-by
#3 lore raw
Quoted 14 lines · Heiko Carstens
Quoted 10 lines · Masami Hiramatsu

arch/s390/include/asm/ptrace.h struct user_regs_struct

Quoted 3 lines
arch/s390/include/asm/ptrace.h +3 -0
+int regs_query_register_offset(const char *name);
+const char *regs_query_register_name(unsigned int offset);
+unsigned long regs_get_argument_nth(struct pt_regs *regs, unsigned int n);

Hmm, the latest kprobe-tracer on -tip/master doesn't support regs_get_argument_nth() anymore, because the function ABI strongly depends on each function interface, compile option etc. So I removed it (14640106f243a3b29944d7198569090fa6546f2d and aa5add93e92019018e905146f8c3d3f8e3c08300).

Quoted 2 lines

Yeah, those patches are still on -tip tree. Since I'm working on -tip/master for kprobe-tracer etc., please work on -tip tree.

Quoted 7 lines

Ok, here is an updated patch without regs_get_argument_nth:

Subject: [PATCH] s390: add pt_regs register and stack access API

From: Heiko Carstens <[email protected]>

This API is needed for the kprobe-based event tracer.

Thank you,
At least interfaces looks good to me.

Quoted 116 lines
Cc Martin Schwidefsky <[email protected]>
---
 arch/s390/Kconfig              |    1 
 arch/s390/include/asm/ptrace.h |   13 ++++++++-
 arch/s390/kernel/ptrace.c      |   58 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+), 1 deletion(-)
arch/s390/include/asm/ptrace.h +12 -1
@@ -492,13 +492,24 @@ struct user_regs_struct
 struct task_struct;
 extern void user_enable_single_step(struct task_struct *);
 extern void user_disable_single_step(struct task_struct *);
+extern void show_regs(struct pt_regs * regs);
 
 #define user_mode(regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0)
 #define instruction_pointer(regs) ((regs)->psw.addr & PSW_ADDR_INSN)
 #define user_stack_pointer(regs)((regs)->gprs[15])
 #define regs_return_value(regs)((regs)->gprs[2])
 #define profile_pc(regs) instruction_pointer(regs)
-extern void show_regs(struct pt_regs * regs);
+
+int regs_query_register_offset(const char *name);
+const char *regs_query_register_name(unsigned int offset);
+unsigned long regs_get_register(struct pt_regs *regs, unsigned int offset);
+unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, unsigned int n);
+
+static inline unsigned long kernel_stack_pointer(struct pt_regs *regs)
+{
+	return regs->gprs[15] & PSW_ADDR_INSN;
+}
+
 #endif /* __KERNEL__ */
 #endif /* __ASSEMBLY__ */
 
arch/s390/Kconfig +1 -0
@@ -90,6 +90,7 @@ config S390
 	select HAVE_SYSCALL_TRACEPOINTS
 	select HAVE_DYNAMIC_FTRACE
 	select HAVE_FUNCTION_GRAPH_TRACER
+	select HAVE_REGS_AND_STACK_ACCESS_API
 	select HAVE_DEFAULT_NO_SPIN_MUTEXES
 	select HAVE_OPROFILE
 	select HAVE_KPROBES
arch/s390/kernel/ptrace.c +58 -1
@@ -992,3 +992,61 @@ const struct user_regset_view *task_user
 #endif
 	return &user_s390_view;
 }
+
+static const char *gpr_names[NUM_GPRS] = {
+	"r0", "r1",  "r2",  "r3",  "r4",  "r5",  "r6",  "r7",
+	"r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15",
+};
+
+unsigned long regs_get_register(struct pt_regs *regs, unsigned int offset)
+{
+	if (offset >= NUM_GPRS)
+		return 0;
+	return regs->gprs[offset];
+}
+
+int regs_query_register_offset(const char *name)
+{
+	unsigned long offset;
+
+	if (!name || *name != 'r')
+		return -EINVAL;
+	if (strict_strtoul(name + 1, 10, &offset))
+		return -EINVAL;
+	if (offset >= NUM_GPRS)
+		return -EINVAL;
+	return offset;
+}
+
+const char *regs_query_register_name(unsigned int offset)
+{
+	if (offset >= NUM_GPRS)
+		return NULL;
+	return gpr_names[offset];
+}
+
+static int regs_within_kernel_stack(struct pt_regs *regs, unsigned long addr)
+{
+	unsigned long ksp = kernel_stack_pointer(regs);
+
+	return (addr & ~(THREAD_SIZE - 1)) == (ksp & ~(THREAD_SIZE - 1));
+}
+
+/**
+ * regs_get_kernel_stack_nth() - get Nth entry of the stack
+ * @regs:pt_regs which contains kernel stack pointer.
+ * @n:stack entry number.
+ *
+ * regs_get_kernel_stack_nth() returns @n th entry of the kernel stack which
+ * is specifined by @regs. If the @n th entry is NOT in the kernel stack,
+ * this returns 0.
+ */
+unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, unsigned int n)
+{
+	unsigned long addr;
+
+	addr = kernel_stack_pointer(regs) + n * sizeof(long);
+	if (!regs_within_kernel_stack(regs, addr))
+		return 0;
+	return *(unsigned long *)addr;
+}
--

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Signature · 7 lines
Masami Hiramatsu

Software Engineer
Hitachi Computer Products (America), Inc.
Software Solutions Division

e-mail: [email protected]
#4 lore raw

[tip:tracing/core] s390: Add pt_regs register and stack access API

In reply to Heiko Carstens
Commit-ID:  952974ac61f686896bd4134dae106a886a5589f1
Gitweb:     http://git.kernel.org/tip/952974ac61f686896bd4134dae106a886a5589f1
Author:     Heiko Carstens <[email protected]>
AuthorDate: Fri, 12 Feb 2010 13:38:40 +0100
Committer:  Frederic Weisbecker <[email protected]>
CommitDate: Wed, 17 Feb 2010 13:19:26 +0100

s390: Add pt_regs register and stack access API

This API is needed for the kprobe-based event tracer.

LKML-Reference: <[email protected]>

---
 arch/s390/Kconfig              |    1 +
 arch/s390/include/asm/ptrace.h |   13 ++++++++-
 arch/s390/kernel/ptrace.c      |   58 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+), 1 deletions(-)
arch/s390/Kconfig +1 -0
index c802352..2590ce2 100644
@@ -87,6 +87,7 @@ config S390
 	select HAVE_SYSCALL_TRACEPOINTS
 	select HAVE_DYNAMIC_FTRACE
 	select HAVE_FUNCTION_GRAPH_TRACER
+	select HAVE_REGS_AND_STACK_ACCESS_API
 	select HAVE_DEFAULT_NO_SPIN_MUTEXES
 	select HAVE_OPROFILE
 	select HAVE_KPROBES
arch/s390/include/asm/ptrace.h +12 -1
index 95dcf18..dd2d913 100644
@@ -492,13 +492,24 @@ struct user_regs_struct
 struct task_struct;
 extern void user_enable_single_step(struct task_struct *);
 extern void user_disable_single_step(struct task_struct *);
+extern void show_regs(struct pt_regs * regs);
 
 #define user_mode(regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0)
 #define instruction_pointer(regs) ((regs)->psw.addr & PSW_ADDR_INSN)
 #define user_stack_pointer(regs)((regs)->gprs[15])
 #define regs_return_value(regs)((regs)->gprs[2])
 #define profile_pc(regs) instruction_pointer(regs)
-extern void show_regs(struct pt_regs * regs);
+
+int regs_query_register_offset(const char *name);
+const char *regs_query_register_name(unsigned int offset);
+unsigned long regs_get_register(struct pt_regs *regs, unsigned int offset);
+unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, unsigned int n);
+
+static inline unsigned long kernel_stack_pointer(struct pt_regs *regs)
+{
+	return regs->gprs[15] & PSW_ADDR_INSN;
+}
+
 #endif /* __KERNEL__ */
 #endif /* __ASSEMBLY__ */
 
arch/s390/kernel/ptrace.c +58 -0

61 lines not on this page · raw message