OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

csky: optimize kernel panic print. 

Use STACKTRACE to optimize panic print more pretty and align registers
printing.

Signed-off-by: Guo Ren <ren_guo@c-sky.com>
This commit is contained in:
Guo Ren 2018-12-09 17:07:20 +08:00
parent 0ea2dc7cd6
commit 8f4f1639a1
3 changed files with 41 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
arch/csky/kernel/dumpstack.c
View File

@ -7,60 +7,39 @@ int kstack_depth_to_print = 48;
void show_trace(unsigned long *stack) void show_trace(unsigned long *stack)
{ {
unsigned long *endstack; unsigned long *stack_end;
unsigned long *stack_start;
unsigned long *fp;
unsigned long addr; unsigned long addr;
int i;
pr_info("Call Trace:\n"); addr = (unsigned long) stack & THREAD_MASK;
addr = (unsigned long)stack + THREAD_SIZE - 1; stack_start = (unsigned long *) addr;
endstack = (unsigned long *)(addr & -THREAD_SIZE); stack_end = (unsigned long *) (addr + THREAD_SIZE);
i = 0;
while (stack + 1 <= endstack) { fp = stack;
addr = *stack++; pr_info("\nCall Trace:");
/*
* If the address is either in the text segment of the while (fp > stack_start && fp < stack_end) {
* kernel, or in the region which contains vmalloc'ed #ifdef CONFIG_STACKTRACE
* memory, it *may* be the address of a calling addr = fp[1];
* routine; if so, print it so that someone tracing fp = (unsigned long *) fp[0];
* down the cause of the crash will be able to figure #else
* out the call path that was taken. addr = *fp++;
*/
if (__kernel_text_address(addr)) {
#ifndef CONFIG_KALLSYMS
if (i % 5 == 0)
pr_cont("\n ");
#endif #endif
pr_cont(" [<%08lx>] %pS\n", addr, (void *)addr); if (__kernel_text_address(addr))
i++; pr_cont("\n[<%08lx>] %pS", addr, (void *)addr);
}
} }
pr_cont("\n"); pr_cont("\n");
} }
void show_stack(struct task_struct *task, unsigned long *stack) void show_stack(struct task_struct *task, unsigned long *stack)
{ {
unsigned long *p;
unsigned long *endstack;
int i;
if (!stack) { if (!stack) {
if (task) if (task)
stack = (unsigned long *)task->thread.esp0; stack = (unsigned long *)thread_saved_fp(task);
else else
stack = (unsigned long *)&stack; stack = (unsigned long *)&stack;
} }
endstack = (unsigned long *)
(((unsigned long)stack + THREAD_SIZE - 1) & -THREAD_SIZE);
pr_info("Stack from %08lx:", (unsigned long)stack);
p = stack;
for (i = 0; i < kstack_depth_to_print; i++) {
if (p + 1 > endstack)
break;
if (i % 8 == 0)
pr_cont("\n ");
pr_cont(" %08lx", *p++);
}
pr_cont("\n");
show_trace(stack); show_trace(stack);
} }

34
arch/csky/kernel/ptrace.c
View File

@ -241,6 +241,7 @@ asmlinkage void syscall_trace(int why, struct pt_regs *regs)
regs->regs[SYSTRACE_SAVENUM] = saved_why; regs->regs[SYSTRACE_SAVENUM] = saved_why;
} }
extern void show_stack(struct task_struct *task, unsigned long *stack);
void show_regs(struct pt_regs *fp) void show_regs(struct pt_regs *fp)
{ {
unsigned long *sp; unsigned long *sp;
@ -263,35 +264,37 @@ void show_regs(struct pt_regs *fp)
(int) (((unsigned long) current) + 2 * PAGE_SIZE)); (int) (((unsigned long) current) + 2 * PAGE_SIZE));
} }
pr_info("PC: 0x%08lx\n", (long)fp->pc); pr_info("PC: 0x%08lx (%pS)\n", (long)fp->pc, (void *)fp->pc);
pr_info("LR: 0x%08lx (%pS)\n", (long)fp->lr, (void *)fp->lr);
pr_info("SP: 0x%08lx\n", (long)fp);
pr_info("orig_a0: 0x%08lx\n", fp->orig_a0); pr_info("orig_a0: 0x%08lx\n", fp->orig_a0);
pr_info("PSR: 0x%08lx\n", (long)fp->sr); pr_info("PSR: 0x%08lx\n", (long)fp->sr);
pr_info("a0: 0x%08lx a1: 0x%08lx a2: 0x%08lx a3: 0x%08lx\n", pr_info(" a0: 0x%08lx a1: 0x%08lx a2: 0x%08lx a3: 0x%08lx\n",
fp->a0, fp->a1, fp->a2, fp->a3); fp->a0, fp->a1, fp->a2, fp->a3);
#if defined(__CSKYABIV2__) #if defined(__CSKYABIV2__)
pr_info("r4: 0x%08lx r5: 0x%08lx r6: 0x%08lx r7: 0x%08lx\n", pr_info(" r4: 0x%08lx r5: 0x%08lx r6: 0x%08lx r7: 0x%08lx\n",
fp->regs[0], fp->regs[1], fp->regs[2], fp->regs[3]); fp->regs[0], fp->regs[1], fp->regs[2], fp->regs[3]);
pr_info("r8: 0x%08lx r9: 0x%08lx r10: 0x%08lx r11: 0x%08lx\n", pr_info(" r8: 0x%08lx r9: 0x%08lx r10: 0x%08lx r11: 0x%08lx\n",
fp->regs[4], fp->regs[5], fp->regs[6], fp->regs[7]); fp->regs[4], fp->regs[5], fp->regs[6], fp->regs[7]);
pr_info("r12 0x%08lx r13: 0x%08lx r15: 0x%08lx\n", pr_info("r12: 0x%08lx r13: 0x%08lx r15: 0x%08lx\n",
fp->regs[8], fp->regs[9], fp->lr); fp->regs[8], fp->regs[9], fp->lr);
pr_info("r16:0x%08lx r17: 0x%08lx r18: 0x%08lx r19: 0x%08lx\n", pr_info("r16: 0x%08lx r17: 0x%08lx r18: 0x%08lx r19: 0x%08lx\n",
fp->exregs[0], fp->exregs[1], fp->exregs[2], fp->exregs[3]); fp->exregs[0], fp->exregs[1], fp->exregs[2], fp->exregs[3]);
pr_info("r20 0x%08lx r21: 0x%08lx r22: 0x%08lx r23: 0x%08lx\n", pr_info("r20: 0x%08lx r21: 0x%08lx r22: 0x%08lx r23: 0x%08lx\n",
fp->exregs[4], fp->exregs[5], fp->exregs[6], fp->exregs[7]); fp->exregs[4], fp->exregs[5], fp->exregs[6], fp->exregs[7]);
pr_info("r24 0x%08lx r25: 0x%08lx r26: 0x%08lx r27: 0x%08lx\n", pr_info("r24: 0x%08lx r25: 0x%08lx r26: 0x%08lx r27: 0x%08lx\n",
fp->exregs[8], fp->exregs[9], fp->exregs[10], fp->exregs[11]); fp->exregs[8], fp->exregs[9], fp->exregs[10], fp->exregs[11]);
pr_info("r28 0x%08lx r29: 0x%08lx r30: 0x%08lx tls: 0x%08lx\n", pr_info("r28: 0x%08lx r29: 0x%08lx r30: 0x%08lx tls: 0x%08lx\n",
fp->exregs[12], fp->exregs[13], fp->exregs[14], fp->tls); fp->exregs[12], fp->exregs[13], fp->exregs[14], fp->tls);
pr_info("hi 0x%08lx lo: 0x%08lx\n", pr_info(" hi: 0x%08lx lo: 0x%08lx\n",
fp->rhi, fp->rlo); fp->rhi, fp->rlo);
#else #else
pr_info("r6: 0x%08lx r7: 0x%08lx r8: 0x%08lx r9: 0x%08lx\n", pr_info(" r6: 0x%08lx r7: 0x%08lx r8: 0x%08lx r9: 0x%08lx\n",
fp->regs[0], fp->regs[1], fp->regs[2], fp->regs[3]); fp->regs[0], fp->regs[1], fp->regs[2], fp->regs[3]);
pr_info("r10: 0x%08lx r11: 0x%08lx r12: 0x%08lx r13: 0x%08lx\n", pr_info("r10: 0x%08lx r11: 0x%08lx r12: 0x%08lx r13: 0x%08lx\n",
fp->regs[4], fp->regs[5], fp->regs[6], fp->regs[7]); fp->regs[4], fp->regs[5], fp->regs[6], fp->regs[7]);
pr_info("r14 0x%08lx r1: 0x%08lx r15: 0x%08lx\n", pr_info("r14: 0x%08lx r1: 0x%08lx r15: 0x%08lx\n",
fp->regs[8], fp->regs[9], fp->lr); fp->regs[8], fp->regs[9], fp->lr);
#endif #endif
@ -313,4 +316,7 @@ void show_regs(struct pt_regs *fp)
pr_cont("%08x ", (int) *sp++); pr_cont("%08x ", (int) *sp++);
} }
pr_cont("\n"); pr_cont("\n");
show_stack(NULL, (unsigned long *)fp->regs[4]);
return;
} }

4
arch/csky/mm/fault.c
View File

@ -188,8 +188,8 @@ no_context:
* terminate things with extreme prejudice. * terminate things with extreme prejudice.
*/ */
bust_spinlocks(1); bust_spinlocks(1);
pr_alert("Unable to %s at vaddr: %08lx, epc: %08lx\n", pr_alert("Unable to handle kernel paging request at virtual "
__func__, address, regs->pc); "address 0x%08lx, pc: 0x%08lx\n", address, regs->pc);
die_if_kernel("Oops", regs, write); die_if_kernel("Oops", regs, write);
out_of_memory: out_of_memory: