Skip to content

Commit

Permalink
simplify the stacktrace code
Browse files Browse the repository at this point in the history 
Simplify the stacktrace code:

 - remove the unused task argument to save_stack_trace, it's always
   current
 - remove the all_contexts flag, it's alwasy 0

Signed-off-by: Christoph Hellwig <[email protected]>
Cc: Paul Mundt <[email protected]>
Cc: Ralf Baechle <[email protected]>
Cc: Martin Schwidefsky <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Andi Kleen <[email protected]>
Cc: Akinobu Mita <[email protected]>
Acked-by: Ingo Molnar <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Christoph Hellwig authored and Linus Torvalds committed May 8, 2007
1 parent 7e4c369 commit ab1b6f0
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 61 deletions.
22 changes: 6 additions & 16 deletions arch/mips/kernel/stacktrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ static void save_raw_context_stack(struct stack_trace *trace,
}
}

static void save_context_stack(struct stack_trace *trace,
struct task_struct *task, struct pt_regs *regs)
static void save_context_stack(struct stack_trace *trace, struct pt_regs *regs)
{
unsigned long sp = regs->regs[29];
#ifdef CONFIG_KALLSYMS
Expand All @@ -41,7 +40,7 @@ static void save_context_stack(struct stack_trace *trace,

if (raw_show_trace || !__kernel_text_address(pc)) {
unsigned long stack_page =
(unsigned long)task_stack_page(task);
(unsigned long)task_stack_page(current);
if (stack_page && sp >= stack_page &&
sp <= stack_page + THREAD_SIZE - 32)
save_raw_context_stack(trace, sp);
Expand All @@ -54,7 +53,7 @@ static void save_context_stack(struct stack_trace *trace,
trace->entries[trace->nr_entries++] = pc;
if (trace->nr_entries >= trace->max_entries)
break;
pc = unwind_stack(task, &sp, pc, &ra);
pc = unwind_stack(current, &sp, pc, &ra);
} while (pc);
#else
save_raw_context_stack(trace, sp);
Expand All @@ -64,22 +63,13 @@ static void save_context_stack(struct stack_trace *trace,
/*
* Save stack-backtrace addresses into a stack_trace buffer.
*/
void save_stack_trace(struct stack_trace *trace, struct task_struct *task)
void save_stack_trace(struct stack_trace *trace)
{
struct pt_regs dummyregs;
struct pt_regs *regs = &dummyregs;

WARN_ON(trace->nr_entries || !trace->max_entries);

if (task && task != current) {
regs->regs[29] = task->thread.reg29;
regs->regs[31] = 0;
regs->cp0_epc = task->thread.reg31;
} else {
if (!task)
task = current;
prepare_frametrace(regs);
}

save_context_stack(trace, task, regs);
prepare_frametrace(regs);
save_context_stack(trace, regs);
}
18 changes: 7 additions & 11 deletions arch/s390/kernel/stacktrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ static unsigned long save_context_stack(struct stack_trace *trace,
}
}

void save_stack_trace(struct stack_trace *trace, struct task_struct *task)
void save_stack_trace(struct stack_trace *trace)
{
register unsigned long sp asm ("15");
unsigned long orig_sp, new_sp;
Expand All @@ -69,20 +69,16 @@ void save_stack_trace(struct stack_trace *trace, struct task_struct *task)
new_sp = save_context_stack(trace, &trace->skip, orig_sp,
S390_lowcore.panic_stack - PAGE_SIZE,
S390_lowcore.panic_stack);
if ((new_sp != orig_sp) && !trace->all_contexts)
if (new_sp != orig_sp)
return;
new_sp = save_context_stack(trace, &trace->skip, new_sp,
S390_lowcore.async_stack - ASYNC_SIZE,
S390_lowcore.async_stack);
if ((new_sp != orig_sp) && !trace->all_contexts)
if (new_sp != orig_sp)
return;
if (task)
save_context_stack(trace, &trace->skip, new_sp,
(unsigned long) task_stack_page(task),
(unsigned long) task_stack_page(task) + THREAD_SIZE);
else
save_context_stack(trace, &trace->skip, new_sp,
S390_lowcore.thread_info,
S390_lowcore.thread_info + THREAD_SIZE);

save_context_stack(trace, &trace->skip, new_sp,
S390_lowcore.thread_info,
S390_lowcore.thread_info + THREAD_SIZE);
return;
}
9 changes: 1 addition & 8 deletions arch/sh/kernel/stacktrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,7 @@
*/
void save_stack_trace(struct stack_trace *trace, struct task_struct *task)
{
unsigned long *sp;

if (!task)
task = current;
if (task == current)
sp = (unsigned long *)current_stack_pointer;
else
sp = (unsigned long *)task->thread.sp;
unsigned long *sp = (unsigned long *)current_stack_pointer;

while (!kstack_end(sp)) {
unsigned long addr = *sp++;
Expand Down
20 changes: 7 additions & 13 deletions arch/sparc64/kernel/stacktrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,16 @@
#include <linux/thread_info.h>
#include <asm/ptrace.h>

void save_stack_trace(struct stack_trace *trace, struct task_struct *task)
void save_stack_trace(struct stack_trace *trace)
{
unsigned long ksp, fp, thread_base;
struct thread_info *tp;
struct thread_info *tp = task_thread_info(current);

if (!task)
task = current;
tp = task_thread_info(task);
if (task == current) {
flushw_all();
__asm__ __volatile__(
"mov %%fp, %0"
: "=r" (ksp)
);
} else
ksp = tp->ksp;
flushw_all();
__asm__ __volatile__(
"mov %%fp, %0"
: "=r" (ksp)
);

fp = ksp + STACK_BIAS;
thread_base = (unsigned long) tp;
Expand Down
8 changes: 3 additions & 5 deletions arch/x86_64/kernel/stacktrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ save_stack_warning_symbol(void *data, char *msg, unsigned long symbol)

static int save_stack_stack(void *data, char *name)
{
struct stack_trace *trace = (struct stack_trace *)data;
return trace->all_contexts ? 0 : -1;
return -1;
}

static void save_stack_address(void *data, unsigned long addr)
Expand All @@ -46,11 +45,10 @@ static struct stacktrace_ops save_stack_ops = {
/*
* Save stack-backtrace addresses into a stack_trace buffer.
*/
void save_stack_trace(struct stack_trace *trace, struct task_struct *task)
void save_stack_trace(struct stack_trace *trace)
{
dump_trace(task, NULL, NULL, &save_stack_ops, trace);
dump_trace(current, NULL, NULL, &save_stack_ops, trace);
if (trace->nr_entries < trace->max_entries)
trace->entries[trace->nr_entries++] = ULONG_MAX;
}
EXPORT_SYMBOL(save_stack_trace);

6 changes: 2 additions & 4 deletions include/linux/stacktrace.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,13 @@ struct stack_trace {
unsigned int nr_entries, max_entries;
unsigned long *entries;
int skip; /* input argument: How many entries to skip */
int all_contexts; /* input argument: if true do than one stack */
};

extern void save_stack_trace(struct stack_trace *trace,
struct task_struct *task);
extern void save_stack_trace(struct stack_trace *trace);

extern void print_stack_trace(struct stack_trace *trace, int spaces);
#else
# define save_stack_trace(trace, task) do { } while (0)
# define save_stack_trace(trace) do { } while (0)
# define print_stack_trace(trace) do { } while (0)
#endif

Expand Down
3 changes: 1 addition & 2 deletions kernel/lockdep.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,8 @@ static int save_trace(struct stack_trace *trace)
trace->entries = stack_trace + nr_stack_trace_entries;

trace->skip = 3;
trace->all_contexts = 0;

save_stack_trace(trace, NULL);
save_stack_trace(trace);

trace->max_entries = trace->nr_entries;

Expand Down
3 changes: 1 addition & 2 deletions lib/fault-inject.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,8 @@ static bool fail_stacktrace(struct fault_attr *attr)
trace.entries = entries;
trace.max_entries = depth;
trace.skip = 1;
trace.all_contexts = 0;

save_stack_trace(&trace, NULL);
save_stack_trace(&trace);
for (n = 0; n < trace.nr_entries; n++) {
if (attr->reject_start <= entries[n] &&
entries[n] < attr->reject_end)
Expand Down

0 comments on commit ab1b6f0

Please sign in to comment.