Skip to contentSkip to conversation

ftrace: Allow WITH_ARGS flavour of graph tracer with shadow call stack

PATCH Applied Ard Biesheuvel 2 participants 2 messages Dec 13, 2022 – Dec 14, 2022

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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 ddc9863e9e90 ("scs: Disable when function graph tracing is enabled")
---
 arch/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/Kconfig +1 -1
index 2d0e7099eb3ffa21..b79c2de9ae5bda52 100644
@@ -638,7 +638,7 @@ config ARCH_SUPPORTS_SHADOW_CALL_STACK
 config SHADOW_CALL_STACK
 	bool "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
 	  This option enables the compiler's Shadow Call Stack, which
 	  uses a shadow stack to protect function return addresses from
Signature · 7 lines
2.35.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Applied
#1 lore raw
Quoted 8 lines · Ard Biesheuvel

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.

[...]

Applied to arm64 (for-next/core), thanks!

[1/1] ftrace: Allow WITH_ARGS flavour of graph tracer with shadow call stack

      https://git.kernel.org/arm64/c/38792972de42

Cheers,

Signature · 10 lines
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel