Commit e028c4f7 authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Steven Rostedt (VMware)
Browse files

objtool: Add frame-pointer-specific function ignore 

Add a CONFIG_FRAME_POINTER-specific version of
STACK_FRAME_NON_STANDARD() for the case where a function is
intentionally missing frame pointer setup, but otherwise needs
objtool/ORC coverage when frame pointers are disabled.

Link: https://lkml.kernel.org/r/163163047364.489837.17377799909553689661.stgit@devnote2



Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Reviewed-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Tested-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 03bac0df

include/linux/objtool.h

+12 −0
Original line number Diff line number Diff line
@@ -66,6 +66,17 @@ struct unwind_hint { 
	static void __used __section(".discard.func_stack_frame_non_standard") \

		*__func_stack_frame_non_standard_##func = func



/*

 * STACK_FRAME_NON_STANDARD_FP() is a frame-pointer-specific function ignore

 * for the case where a function is intentionally missing frame pointer setup,

 * but otherwise needs objtool/ORC coverage when frame pointers are disabled.

 */

#ifdef CONFIG_FRAME_POINTER

#define STACK_FRAME_NON_STANDARD_FP(func) STACK_FRAME_NON_STANDARD(func)

#else

#define STACK_FRAME_NON_STANDARD_FP(func)

#endif



#else /* __ASSEMBLY__ */



/*
@@ -127,6 +138,7 @@ struct unwind_hint { 
#define UNWIND_HINT(sp_reg, sp_offset, type, end)	\

	"\n\t"

#define STACK_FRAME_NON_STANDARD(func)

#define STACK_FRAME_NON_STANDARD_FP(func)

#else

#define ANNOTATE_INTRA_FUNCTION_CALL

.macro UNWIND_HINT sp_reg:req sp_offset=0 type:req end=0

tools/include/linux/objtool.h

+12 −0
Original line number Diff line number Diff line
@@ -66,6 +66,17 @@ struct unwind_hint { 
	static void __used __section(".discard.func_stack_frame_non_standard") \

		*__func_stack_frame_non_standard_##func = func



/*

 * STACK_FRAME_NON_STANDARD_FP() is a frame-pointer-specific function ignore

 * for the case where a function is intentionally missing frame pointer setup,

 * but otherwise needs objtool/ORC coverage when frame pointers are disabled.

 */

#ifdef CONFIG_FRAME_POINTER

#define STACK_FRAME_NON_STANDARD_FP(func) STACK_FRAME_NON_STANDARD(func)

#else

#define STACK_FRAME_NON_STANDARD_FP(func)

#endif



#else /* __ASSEMBLY__ */



/*
@@ -127,6 +138,7 @@ struct unwind_hint { 
#define UNWIND_HINT(sp_reg, sp_offset, type, end)	\

	"\n\t"

#define STACK_FRAME_NON_STANDARD(func)

#define STACK_FRAME_NON_STANDARD_FP(func)

#else

#define ANNOTATE_INTRA_FUNCTION_CALL

.macro UNWIND_HINT sp_reg:req sp_offset=0 type:req end=0