Skip to content

Commit 3879297

Browse files
ardbiesheuvelwilldeacon
authored andcommitted
ftrace: Allow WITH_ARGS flavour of graph tracer with shadow call stack
The recent switch on arm64 from DYNAMIC_FTRACE_WITH_REGS to DYNAMIC_FTRACE_WITH_ARGS failed to take into account that we currently require the former in order to allow the function graph tracer to be enabled in combination with shadow call stacks. This means that this is no longer permitted at all, in spite of the fact that either flavour of ftrace works perfectly fine in this combination. So permit WITH_ARGS as well as WITH_REGS. Fixes: ddc9863 ("scs: Disable when function graph tracing is enabled") Acked-by: Mark Rutland <[email protected]> Acked-by: Steven Rostedt (Google) <[email protected]> Signed-off-by: Ard Biesheuvel <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
1 parent 5f4c374 commit 3879297

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ config ARCH_SUPPORTS_SHADOW_CALL_STACK
635635
config SHADOW_CALL_STACK
636636
bool "Shadow Call Stack"
637637
depends on ARCH_SUPPORTS_SHADOW_CALL_STACK
638-
depends on DYNAMIC_FTRACE_WITH_REGS || !FUNCTION_GRAPH_TRACER
638+
depends on DYNAMIC_FTRACE_WITH_ARGS || DYNAMIC_FTRACE_WITH_REGS || !FUNCTION_GRAPH_TRACER
639639
help
640640
This option enables the compiler's Shadow Call Stack, which
641641
uses a shadow stack to protect function return addresses from

0 commit comments

Comments
 (0)