]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
riscv: Fix fp alignment bug in perf_callchain_user()
authorJinjie Ruan <ruanjinjie@huawei.com>
Mon, 8 Jul 2024 03:28:46 +0000 (11:28 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 4 Oct 2024 14:33:12 +0000 (16:33 +0200)
[ Upstream commit 22ab08955ea13be04a8efd20cc30890e0afaa49c ]

The standard RISC-V calling convention said:
"The stack grows downward and the stack pointer is always
kept 16-byte aligned".

So perf_callchain_user() should check whether 16-byte aligned for fp.

Link: https://riscv.org/wp-content/uploads/2015/01/riscv-calling.pdf
Fixes: dbeb90b0c1eb ("riscv: Add perf callchain support")
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Cc: Björn Töpel <bjorn@kernel.org>
Link: https://lore.kernel.org/r/20240708032847.2998158-2-ruanjinjie@huawei.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/riscv/kernel/perf_callchain.c

index 3348a61de7d998c6a87ce8e7113d67fefc1c955a..2932791e93882176bd1a515781f9e9f0d1145424 100644 (file)
@@ -62,7 +62,7 @@ void perf_callchain_user(struct perf_callchain_entry_ctx *entry,
        perf_callchain_store(entry, regs->epc);
 
        fp = user_backtrace(entry, fp, regs->ra);
-       while (fp && !(fp & 0x3) && entry->nr < entry->max_stack)
+       while (fp && !(fp & 0x7) && entry->nr < entry->max_stack)
                fp = user_backtrace(entry, fp, 0);
 }