Unverified Commit f3a0c23f authored Jul 10, 2023 by Sami Tolvanen Committed by Palmer Dabbelt Aug 23, 2023

riscv: Add ftrace_stub_graph



Commit 883bbbff ("ftrace,kcfi: Separate ftrace_stub() and
ftrace_stub_graph()") added a separate ftrace_stub_graph function for
CFI_CLANG. Add the stub to fix FUNCTION_GRAPH_TRACER compatibility
with CFI.

Reviewed-by: Kees Cook <keescook@chromium.org>
Tested-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Link: https://lore.kernel.org/r/20230710183544.999540-11-samitolvanen@google.com


Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>

parent 5f59c685

arch/riscv/kernel/mcount.S

+4 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,10 @@ SYM_TYPED_FUNC_START(ftrace_stub)
		SYM_FUNC_END(ftrace_stub)

		#ifdef CONFIG_FUNCTION_GRAPH_TRACER
		SYM_TYPED_FUNC_START(ftrace_stub_graph)
		ret
		SYM_FUNC_END(ftrace_stub_graph)

		ENTRY(return_to_handler)
		/*
		* On implementing the frame point test, the ideal way is to compare the