iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm64: Call __show_regs directly

Browse Source 
Generic code expects show_regs() to also dump the stack, but arm64's
show_reg() does not do this. Some arm64 callers of show_regs() *only*
want the registers dumped, without the stack.

To enable generic code to work as expected, we need to make
show_regs() dump the stack. Where we only want the registers dumped,
we must use __show_regs().

This patch updates code to use __show_regs() where only registers are
desired. A subsequent patch will modify show_regs().

Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
This commit is contained in:
Kefeng Wang 2017-05-09 09:53:36 +08:00 committed by Will Deacon
parent 48f99c8ec0
commit c07ab957d9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/kernel/probes/kprobes.c
View File

@ -522,9 +522,9 @@ int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
pr_err("current sp %lx does not match saved sp %lx\n", pr_err("current sp %lx does not match saved sp %lx\n",
orig_sp, stack_addr); orig_sp, stack_addr);
pr_err("Saved registers for jprobe %p\n", jp); pr_err("Saved registers for jprobe %p\n", jp);
show_regs(saved_regs); __show_regs(saved_regs);
pr_err("Current registers\n"); pr_err("Current registers\n");
show_regs(regs); __show_regs(regs);
BUG(); BUG();
} }
unpause_graph_tracing(); unpause_graph_tracing();

2
arch/arm64/mm/fault.c
View File

@ -250,7 +250,7 @@ static void __do_user_fault(struct task_struct *tsk, unsigned long addr,
tsk->comm, task_pid_nr(tsk), inf->name, sig, tsk->comm, task_pid_nr(tsk), inf->name, sig,
addr, esr); addr, esr);
show_pte(tsk->mm, addr); show_pte(tsk->mm, addr);
show_regs(regs); __show_regs(regs);
} }
tsk->thread.fault_address = addr; tsk->thread.fault_address = addr;