Skip to contentSkip to conversation

oprofile, x86: allow backtrace for 32bit apps under 64bit kernel

PATCH Superseded Jiri Olsa 2 participants 2 messages Sep 13, 2010 – Sep 20, 2010 x86

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Jiri Olsa

author
#0 lore raw

PATCH 1/1 oprofile, x86: allow backtrace for 32bit apps under 64bit kernel

hi,

adding support for backtrace of ia32 applications under 64bit kernels.

wbr,
jirka

---
 arch/x86/oprofile/backtrace.c |   42 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 42 insertions(+), 0 deletions(-)
arch/x86/oprofile/backtrace.c +42 -0
index 3855096..3e443ad 100644
@@ -73,6 +73,38 @@ static struct frame_head *dump_user_backtrace(struct frame_head *head)
 	return bufhead[0].bp;
 }
 
+#ifdef CONFIG_X86_64
+struct frame_head_32 {
+	__u32 ebp;
+	__u32 ret;
+} __attribute__((packed));
+
+static struct frame_head *
+dump_user_backtrace_32(struct frame_head *head)
+{
+	struct frame_head_32 bufhead_32[2];
+	unsigned long bp, ret;
+
+	/* Also check accessibility of one struct frame_head beyond */
+	if (!access_ok(VERIFY_READ, head, sizeof(bufhead_32)))
+		return NULL;
+	if (__copy_from_user_inatomic(bufhead_32, head, sizeof(bufhead_32)))
+		return NULL;
+
+	bp  = bufhead_32[0].ebp;
+	ret = bufhead_32[0].ret;
+
+	oprofile_add_trace(ret);
+
+	/* frame pointers should strictly progress back up the stack
+	* (towards higher addresses) */
+	if (head >= (struct frame_head *) bp)
+		return NULL;
+
+	return (struct frame_head *) bp;
+}
+#endif
+
 void
 x86_backtrace(struct pt_regs * const regs, unsigned int depth)
 {
@@ -86,6 +118,16 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
 		return;
 	}
 
+#ifdef CONFIG_X86_64
+	if (current && test_thread_flag(TIF_IA32)) {
+		/* User process is 32-bit */
+		head = (struct frame_head *)(regs->bp & 0xffffffff);
+		while (depth-- && head)
+			head = dump_user_backtrace_32(head);
+		return;
+	}
+#endif
+
 	while (depth-- && head)
 		head = dump_user_backtrace(head);
 }
Signature · 1 line
1.7.1
#1 lore raw
Quoted 9 lines · Jiri Olsa

hi,

adding support for backtrace of ia32 applications under 64bit kernels.

wbr,
jirka

Quoted 5 lines
---
 arch/x86/oprofile/backtrace.c |   42 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 42 insertions(+), 0 deletions(-)

Jirka,

see my comments below.

Please, provide a more meaningful commit message.

Quoted 6 lines
arch/x86/oprofile/backtrace.c +0 -0
index 3855096..3e443ad 100644

arch/x86/oprofile/backtrace.c static struct frame_head *dump_user_backtrace(struct frame_head *head) · line 80

Quoted 8 lines
arch/x86/oprofile/backtrace.c +5 -0
@@ -73,6 +73,38 @@ static struct frame_head *dump_user_backtrace(struct frame_head *head)
 	return bufhead[0].bp;
 }
 
+#ifdef CONFIG_X86_64
+struct frame_head_32 {
+	__u32 ebp;
+	__u32 ret;
+} __attribute__((packed));

There exists already struct stack_frame_ia32.

Please, also change the code to reuse struct stack_frame for 64 bit processes.

Quoted 11 lines
arch/x86/oprofile/backtrace.c +11 -0
+
+static struct frame_head *
+dump_user_backtrace_32(struct frame_head *head)
+{
+	struct frame_head_32 bufhead_32[2];
+	unsigned long bp, ret;
+
+	/* Also check accessibility of one struct frame_head beyond */
+	if (!access_ok(VERIFY_READ, head, sizeof(bufhead_32)))
+		return NULL;
+	if (__copy_from_user_inatomic(bufhead_32, head, sizeof(bufhead_32)))

arch/x86/oprofile/backtrace.c static struct frame_head *dump_user_backtrace(struct frame_head *head) · line 101

Quoted 10 lines
arch/x86/oprofile/backtrace.c +10 -0
+		return NULL;
+
+	bp  = bufhead_32[0].ebp;
+	ret = bufhead_32[0].ret;
+
+	oprofile_add_trace(ret);
+
+	/* frame pointers should strictly progress back up the stack
+	* (towards higher addresses) */
+	if (head >= (struct frame_head *) bp)

You are mixing up struct frame_head and struct frame_head_32 here.

Quoted 10 lines
arch/x86/oprofile/backtrace.c +6 -0
+		return NULL;
+
+	return (struct frame_head *) bp;
+}
+#endif
+
 void
 x86_backtrace(struct pt_regs * const regs, unsigned int depth)
 {

arch/x86/oprofile/backtrace.c x86_backtrace(struct pt_regs * const regs, unsigned int depth) · line 121

Quoted 4 lines
arch/x86/oprofile/backtrace.c +1 -0
@@ -86,6 +118,16 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
 		return;
 	}
 
+#ifdef CONFIG_X86_64

Rather use CONFIG_COMPAT here.

arch/x86/oprofile/backtrace.c x86_backtrace(struct pt_regs * const regs, unsigned int depth) · line 124

Quoted 3 lines
arch/x86/oprofile/backtrace.c +3 -0
+	if (current && test_thread_flag(TIF_IA32)) {
+		/* User process is 32-bit */
+		head = (struct frame_head *)(regs->bp & 0xffffffff);

Same is provided with compat_ptr().

arch/x86/oprofile/backtrace.c x86_backtrace(struct pt_regs * const regs, unsigned int depth) · line 129

Quoted 5 lines
arch/x86/oprofile/backtrace.c +5 -0
+		while (depth-- && head)
+			head = dump_user_backtrace_32(head);
+		return;
+	}
+#endif

Please avoid inline macros and make this an inline function (maybe x86_backtrace_32) with a function stub for the !CONFIG_COMPAT case.

If possible, try to avoid duplicate code for 32 and 64 bit backtraces.

Thanks,

-Robert

Quoted 8 lines
arch/x86/oprofile/backtrace.c +1 -0
+
 	while (depth-- && head)
 		head = dump_user_backtrace(head);
 }
Signature · 1 line
1.7.1
Signature · 2 lines
Advanced Micro Devices, Inc.
Operating System Research Center