Commit e5db2edb authored by Heiko Carstens's avatar Heiko Carstens Committed by Kamal Mostafa

s390/stacktrace: fix address ranges for asynchronous and panic stack

commit 9900c48c upstream.

git commit dc7ee00d ("s390: lowcore stack pointer offsets")
introduced a regression in regard to save_stack_trace(). The stack
pointer for the asynchronous and the panic stack in the lowcore now
have an additional offset applied to them. This offset needs to be
taken into account in the calculation for the low and high address for
the stacks.

This bug was already partially fixed with 9cc5c206
("s390/dumpstack: fix address ranges for asynchronous and panic
stack"). This patch fixes it also for the stacktrace code.

Fixes: dc7ee00d ("s390: lowcore stack pointer offsets")
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Tested-by: default avatarPeter Oberparleiter <oberpar@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarKamal Mostafa <kamal@canonical.com>
parent 93524716
...@@ -63,17 +63,18 @@ static unsigned long save_context_stack(struct stack_trace *trace, ...@@ -63,17 +63,18 @@ static unsigned long save_context_stack(struct stack_trace *trace,
void save_stack_trace(struct stack_trace *trace) void save_stack_trace(struct stack_trace *trace)
{ {
register unsigned long sp asm ("15"); register unsigned long sp asm ("15");
unsigned long orig_sp, new_sp; unsigned long orig_sp, new_sp, frame_size;
frame_size = STACK_FRAME_OVERHEAD + sizeof(struct pt_regs);
orig_sp = sp & PSW_ADDR_INSN; orig_sp = sp & PSW_ADDR_INSN;
new_sp = save_context_stack(trace, orig_sp, new_sp = save_context_stack(trace, orig_sp,
S390_lowcore.panic_stack - PAGE_SIZE, S390_lowcore.panic_stack + frame_size - PAGE_SIZE,
S390_lowcore.panic_stack, 1); S390_lowcore.panic_stack + frame_size, 1);
if (new_sp != orig_sp) if (new_sp != orig_sp)
return; return;
new_sp = save_context_stack(trace, new_sp, new_sp = save_context_stack(trace, new_sp,
S390_lowcore.async_stack - ASYNC_SIZE, S390_lowcore.async_stack + frame_size - ASYNC_SIZE,
S390_lowcore.async_stack, 1); S390_lowcore.async_stack + frame_size, 1);
if (new_sp != orig_sp) if (new_sp != orig_sp)
return; return;
save_context_stack(trace, new_sp, save_context_stack(trace, new_sp,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment