Commit fc7d1e03 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Zheng Yejian
Browse files

x86/unwind: Compile kretprobe fixup code only if CONFIG_KRETPROBES=y 

mainline inclusion
from mainline-v5.16-rc1
commit 811b93ff
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9R2TB

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=811b93ffaa488a4733270d8c8bc6c773334ab351



--------------------------------

Compile kretprobe related stacktrace entry recovery code and
unwind_state::kr_cur field only when CONFIG_KRETPROBES=y.

Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
Conflicts:
	arch/x86/include/asm/unwind.h
Fixes: b0c9f2f39283 ("x86/unwind: Recover kretprobe trampoline entry")
Signed-off-by: default avatarChen Zhongjin <chenzhongjin@huawei.com>
Signed-off-by: default avatarZheng Yejian <zhengyejian1@huawei.com>
parent c7fc68ca

arch/x86/include/asm/unwind.h

+4 −0
Original line number Diff line number Diff line
@@ -104,9 +104,13 @@ static inline 
unsigned long unwind_recover_kretprobe(struct unwind_state *state,

				       unsigned long addr, unsigned long *addr_p)

{

#ifdef CONFIG_KRETPROBES

	return is_kretprobe_trampoline(addr) ?

		kretprobe_find_ret_addr(state->task, addr_p) :

		addr;

#else

	return addr;

#endif

}



/* Recover the return address modified by kretprobe and ftrace_graph. */