diff options
| author | Ingo Molnar <mingo@kernel.org> | 2022-10-22 09:55:06 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2022-10-22 10:06:18 +0200 |
| commit | bd194611444caf7f30e9198b7e2b89522b257462 (patch) | |
| tree | 99129510f5d7b9cf6c384d4654b64d389cb24cc6 /arch/x86/kernel/ftrace_64.S | |
| parent | dbf53a29b28b277fa952a000245b558536c6bdd7 (diff) | |
| parent | 471f0aa7fa64e23766a1473b32d9ec3f0718895a (diff) | |
| download | linux-bd194611444caf7f30e9198b7e2b89522b257462.tar.gz linux-bd194611444caf7f30e9198b7e2b89522b257462.tar.bz2 linux-bd194611444caf7f30e9198b7e2b89522b257462.zip | |
Merge branch 'x86/urgent' into x86/core, to resolve conflict
There's a conflict between the call-depth tracking commits in x86/core:
ee3e2469b346 ("x86/ftrace: Make it call depth tracking aware")
36b64f101219 ("x86/ftrace: Rebalance RSB")
eac828eaef29 ("x86/ftrace: Remove ftrace_epilogue()")
And these fixes in x86/urgent:
883bbbffa5a4 ("ftrace,kcfi: Separate ftrace_stub() and ftrace_stub_graph()")
b5f1fc318440 ("x86/ftrace: Remove ftrace_epilogue()")
It's non-trivial overlapping modifications - resolve them.
Conflicts:
arch/x86/kernel/ftrace_64.S
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/ftrace_64.S')
| -rw-r--r-- | arch/x86/kernel/ftrace_64.S | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/arch/x86/kernel/ftrace_64.S b/arch/x86/kernel/ftrace_64.S index 6a7e6d666a12..1265ad519249 100644 --- a/arch/x86/kernel/ftrace_64.S +++ b/arch/x86/kernel/ftrace_64.S @@ -3,6 +3,7 @@ * Copyright (C) 2014 Steven Rostedt, Red Hat Inc */ +#include <linux/cfi_types.h> #include <linux/linkage.h> #include <asm/asm-offsets.h> #include <asm/ptrace.h> @@ -130,6 +131,16 @@ .endm +SYM_TYPED_FUNC_START(ftrace_stub) + CALL_DEPTH_ACCOUNT + RET +SYM_FUNC_END(ftrace_stub) + +SYM_TYPED_FUNC_START(ftrace_stub_graph) + CALL_DEPTH_ACCOUNT + RET +SYM_FUNC_END(ftrace_stub_graph) + #ifdef CONFIG_DYNAMIC_FTRACE SYM_FUNC_START(__fentry__) @@ -183,11 +194,6 @@ SYM_INNER_LABEL(ftrace_caller_end, SYM_L_GLOBAL) SYM_FUNC_END(ftrace_caller); STACK_FRAME_NON_STANDARD_FP(ftrace_caller) -SYM_FUNC_START(ftrace_stub) - UNWIND_HINT_FUNC - RET -SYM_FUNC_END(ftrace_stub) - SYM_FUNC_START(ftrace_regs_caller) /* Save the current flags before any operations that can change them */ pushfq @@ -309,9 +315,6 @@ SYM_FUNC_START(__fentry__) cmpq $ftrace_stub, ftrace_trace_function jnz trace - -SYM_INNER_LABEL(ftrace_stub, SYM_L_GLOBAL) - ENDBR RET trace: |