提交 38792972 编写于 作者: A Ard Biesheuvel 提交者: Will Deacon

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: ddc9863e ("scs: Disable when function graph tracing is enabled")
Acked-by: NMark Rutland <mark.rutland@arm.com>
Acked-by: NSteven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: NArd Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20221213132407.1485025-1-ardb@kernel.orgSigned-off-by: NWill Deacon <will@kernel.org>
上级 5f4c3747
...@@ -635,7 +635,7 @@ config ARCH_SUPPORTS_SHADOW_CALL_STACK ...@@ -635,7 +635,7 @@ config ARCH_SUPPORTS_SHADOW_CALL_STACK
config SHADOW_CALL_STACK config SHADOW_CALL_STACK
bool "Shadow Call Stack" bool "Shadow Call Stack"
depends on ARCH_SUPPORTS_SHADOW_CALL_STACK depends on ARCH_SUPPORTS_SHADOW_CALL_STACK
depends on DYNAMIC_FTRACE_WITH_REGS || !FUNCTION_GRAPH_TRACER depends on DYNAMIC_FTRACE_WITH_ARGS || DYNAMIC_FTRACE_WITH_REGS || !FUNCTION_GRAPH_TRACER
help help
This option enables the compiler's Shadow Call Stack, which This option enables the compiler's Shadow Call Stack, which
uses a shadow stack to protect function return addresses from uses a shadow stack to protect function return addresses from
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册