GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-11 00:51:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[PATCH] i386: Get ebp from unwinder state when continuing fallback backtrace

Browse source 
Cc: jbeulich@novell.com
Signed-off-by: Andi Kleen <ak@suse.de>
This commit is contained in:
Andi Kleen 2006-09-26 10:52:34 +02:00 • committed by Andi Kleen
parent 950fee8455
commit a32cf3975b
2 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
arch/i386/kernel/traps.c
View file

@ -171,7 +171,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
unsigned long *stack, unsigned long *stack,
struct stacktrace_ops *ops, void *data) struct stacktrace_ops *ops, void *data)
{ {
unsigned long ebp; unsigned long ebp = 0;
if (!task) if (!task)
task = current; task = current;
@ -199,6 +199,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
stack = (void *)UNW_SP(&info); stack = (void *)UNW_SP(&info);
if (!stack) if (!stack)
return; return;
ebp = UNW_FP(&info);
} else } else
ops->warning(data, "Full inexact backtrace again:\n"); ops->warning(data, "Full inexact backtrace again:\n");
} else if (call_trace >= 1) } else if (call_trace >= 1)
@ -207,13 +208,16 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
ops->warning(data, "Full inexact backtrace again:\n"); ops->warning(data, "Full inexact backtrace again:\n");
} else } else
ops->warning(data, "Inexact backtrace:\n"); ops->warning(data, "Inexact backtrace:\n");
} else if (!stack) { }
if (!stack) {
unsigned long dummy; unsigned long dummy;
stack = &dummy; stack = &dummy;
if (task && task != current) if (task && task != current)
stack = (unsigned long *)task->thread.esp; stack = (unsigned long *)task->thread.esp;
} }
#ifdef CONFIG_FRAME_POINTER
if (!ebp) {
if (task == current) { if (task == current) {
/* Grab ebp right from our regs */ /* Grab ebp right from our regs */
asm ("movl %%ebp, %0" : "=r" (ebp) : ); asm ("movl %%ebp, %0" : "=r" (ebp) : );
@ -221,6 +225,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
/* ebp is the last reg pushed by switch_to */ /* ebp is the last reg pushed by switch_to */
ebp = *(unsigned long *) task->thread.esp; ebp = *(unsigned long *) task->thread.esp;
} }
}
#endif
while (1) { while (1) {
struct thread_info *context; struct thread_info *context;

3
include/asm-i386/unwind.h
View file

@ -28,6 +28,8 @@ struct unwind_frame_info
#define FRAME_LINK_OFFSET 0 #define FRAME_LINK_OFFSET 0
#define STACK_BOTTOM(tsk) STACK_LIMIT((tsk)->thread.esp0) #define STACK_BOTTOM(tsk) STACK_LIMIT((tsk)->thread.esp0)
#define STACK_TOP(tsk) ((tsk)->thread.esp0) #define STACK_TOP(tsk) ((tsk)->thread.esp0)
#else
#define UNW_FP(frame) ((void)(frame), 0)
#endif #endif
#define STACK_LIMIT(ptr) (((ptr) - 1) & ~(THREAD_SIZE - 1)) #define STACK_LIMIT(ptr) (((ptr) - 1) & ~(THREAD_SIZE - 1))
@ -88,6 +90,7 @@ static inline int arch_unw_user_mode(const struct unwind_frame_info *info)
#define UNW_PC(frame) ((void)(frame), 0) #define UNW_PC(frame) ((void)(frame), 0)
#define UNW_SP(frame) ((void)(frame), 0) #define UNW_SP(frame) ((void)(frame), 0)
#define UNW_FP(frame) ((void)(frame), 0)
static inline int arch_unw_user_mode(const void *info) static inline int arch_unw_user_mode(const void *info)
{ {