Commit 77c664fa authored by David S. Miller's avatar David S. Miller
Browse files

[SPARC64]: Detect trap frames in stack backtraces. 



Now that we have a magic cookie in the pt_regs, we can
properly detect trap frames in stack bactraces.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7697daaa

arch/sparc64/kernel/stacktrace.c

+13 −3
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ void save_stack_trace(struct stack_trace *trace) 
	thread_base = (unsigned long) tp;

	do {

		struct reg_window *rw;

		struct pt_regs *regs;

		unsigned long pc;



		/* Bogus frame pointer? */

		if (fp < (thread_base + sizeof(struct thread_info)) ||
@@ -27,11 +29,19 @@ void save_stack_trace(struct stack_trace *trace) 
			break;



		rw = (struct reg_window *) fp;

		regs = (struct pt_regs *) (rw + 1);



		if ((regs->magic & ~0x1ff) == PT_REGS_MAGIC) {

			pc = regs->tpc;

			fp = regs->u_regs[UREG_I6] + STACK_BIAS;

		} else {

			pc = rw->ins[7];

			fp = rw->ins[6] + STACK_BIAS;

		}



		if (trace->skip > 0)

			trace->skip--;

		else

			trace->entries[trace->nr_entries++] = rw->ins[7];



		fp = rw->ins[6] + STACK_BIAS;

			trace->entries[trace->nr_entries++] = pc;

	} while (trace->nr_entries < trace->max_entries);

}

arch/sparc64/kernel/traps.c

+15 −4
Original line number Diff line number Diff line
@@ -2091,9 +2091,8 @@ static void user_instruction_dump(unsigned int __user *pc) 


void show_stack(struct task_struct *tsk, unsigned long *_ksp)

{

	unsigned long pc, fp, thread_base, ksp;

	unsigned long fp, thread_base, ksp;

	struct thread_info *tp;

	struct reg_window *rw;

	int count = 0;



	ksp = (unsigned long) _ksp;
@@ -2117,15 +2116,27 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp) 
	printk("\n");

#endif

	do {

		struct reg_window *rw;

		struct pt_regs *regs;

		unsigned long pc;



		/* Bogus frame pointer? */

		if (fp < (thread_base + sizeof(struct thread_info)) ||

		    fp >= (thread_base + THREAD_SIZE))

			break;

		rw = (struct reg_window *)fp;

		regs = (struct pt_regs *) (rw + 1);



		if ((regs->magic & ~0x1ff) == PT_REGS_MAGIC) {

			pc = regs->tpc;

			fp = regs->u_regs[UREG_I6] + STACK_BIAS;

		} else {

			pc = rw->ins[7];

			fp = rw->ins[6] + STACK_BIAS;

		}



		printk(" [%016lx] ", pc);

		print_symbol("%s\n", pc);

		fp = rw->ins[6] + STACK_BIAS;

	} while (++count < 16);

#ifndef CONFIG_KALLSYMS

	printk("\n");