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

s390/perf_event: fix address range for asynchronous stack

commit 1f8cbb9c upstream.

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

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 perf_event code.

Fixes: dc7ee00d ("s390: lowcore stack pointer offsets")
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarKamal Mostafa <kamal@canonical.com>
parent 97afc2bf
...@@ -262,12 +262,13 @@ static unsigned long __store_trace(struct perf_callchain_entry *entry, ...@@ -262,12 +262,13 @@ static unsigned long __store_trace(struct perf_callchain_entry *entry,
void perf_callchain_kernel(struct perf_callchain_entry *entry, void perf_callchain_kernel(struct perf_callchain_entry *entry,
struct pt_regs *regs) struct pt_regs *regs)
{ {
unsigned long head; unsigned long head, frame_size;
struct stack_frame *head_sf; struct stack_frame *head_sf;
if (user_mode(regs)) if (user_mode(regs))
return; return;
frame_size = STACK_FRAME_OVERHEAD + sizeof(struct pt_regs);
head = regs->gprs[15]; head = regs->gprs[15];
head_sf = (struct stack_frame *) head; head_sf = (struct stack_frame *) head;
...@@ -275,8 +276,9 @@ void perf_callchain_kernel(struct perf_callchain_entry *entry, ...@@ -275,8 +276,9 @@ void perf_callchain_kernel(struct perf_callchain_entry *entry,
return; return;
head = head_sf->back_chain; head = head_sf->back_chain;
head = __store_trace(entry, head, S390_lowcore.async_stack - ASYNC_SIZE, head = __store_trace(entry, head,
S390_lowcore.async_stack); S390_lowcore.async_stack + frame_size - ASYNC_SIZE,
S390_lowcore.async_stack + frame_size);
__store_trace(entry, head, S390_lowcore.thread_info, __store_trace(entry, head, S390_lowcore.thread_info,
S390_lowcore.thread_info + THREAD_SIZE); S390_lowcore.thread_info + THREAD_SIZE);
......
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