objtool: Rewrite annotations
Subsystems (6)
Peter Zijlstra
maintainercover objtool: Rewrite annotations
Just the objtool annotation rewrite bits.
Changes since last time:
- split from the x86 and kvm patches
- s/ANNOTYPE_INTRA_FUNCTION_CALLS/ANNOTYPE_INTRA_FUNCTION_CALL/g
- made __ASM_ANNOTATE() take a full label name (no longer appends 'b')
- added a patch that moves all the annotations to objtool.h
- some changes to the first patch
Peter Zijlstra
maintainerPATCH 1/9 objtool: Generic annotation infrastructure
Avoid endless .discard.foo sections for each annotation, create a single .discard.annotate section that takes an annotation type along with the instruction.
--- include/linux/objtool.h | 18 ++++++++++++++++++ tools/objtool/check.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+)
include/linux/objtool.h +18 -0
@@ -57,6 +57,13 @@".long 998b\n\t" \ ".popsection\n\t" +#define ASM_ANNOTATE (x) \ + "911:\n\t" \ + ".pushsection .discard.annotate,\"M\",@progbits,8\n\t" \ + ".long 911b - .\n\t" \ + ".long " __stringify(x) "\n\t" \ + ".popsection\n\t" +#else /* __ASSEMBLY__ */ /*
@@ -146,6 +153,14 @@ .popsection .endm +.macro ANNOTATE type:req +.Lhere_\@: + .pushsection .discard.annotate,"M",@progbits,8 + .long .Lhere_\@ - . + .long \type + .popsection +.endm +#endif /* __ASSEMBLY__ */ #else /* !CONFIG_OBJTOOL */
@@ -155,6 +170,7 @@#define UNWIND_HINT (type, sp_reg, sp_offset, signal) "\n\t"#define STACK_FRAME_NON_STANDARD (func)#define STACK_FRAME_NON_STANDARD_FP (func) +#define ASM_ANNOTATE (x)#define ANNOTATE_NOENDBR #define ASM_REACHABLE #else
@@ -167,6 +183,8 @@ .endm .macro REACHABLE .endm +.macro ANNOTATE type:req +.endm#endif #endif /* CONFIG_OBJTOOL */
tools/objtool/check.c +45 -0
57 lines not on this page · raw message
Re: [PATCH 1/9] objtool: Generic annotation infrastructure
Quoted 5 lines · Peter Zijlstra
Avoid endless .discard.foo sections for each annotation, create a single .discard.annotate section that takes an annotation type along with the instruction.
Signed-off-by Peter Zijlstra (Intel) <[email protected]>
...
Quoted 14 lines
tools/objtool/check.c +8
-0@@ -2373,6 +2373,49 @@ static int read_unwind_hints(struct objtreturn 0 ; } +static int read_annotate (struct objtool_file *file,void (*func)(int type,struct instruction *insn)) +{ +struct section *sec; +struct instruction *insn; +struct reloc *reloc; +int type; + + sec =find_section_by_name (file->elf,".discard.annotate" );
tools/objtool/check.c static int read_unwind_hints(struct objt · line 2393
Quoted 10 lines
tools/objtool/check.c +10
-0+if (!sec) +return 0 ; + +if (!sec->rsec) +return 0 ; + +if (sec->sh.sh_entsize !=8 ) { +static bool warned = false; +if (!warned) { +WARN ("%s: dodgy linker, sh_entsize != 8" , sec->name);
Thanks to Fangrui, this has been resolved in LLVM main:
https://github.com/llvm/llvm-project/commit/d4bed617f4378873d7ddf4b53c041e7b39d1a9ca
https://github.com/ClangBuiltLinux/linux/issues/2057#issuecomment-2495675374
I have built a version of LLVM from main and verified that this warning does not trigger with that version, while it does with LLVM 19.1.4.
Quoted 10 lines
tools/objtool/check.c +10
-0+ warned = true; + } + sec->sh.sh_entsize =8 ; + } + +for_each_reloc (sec->rsec, reloc) { + type = *(u32 *)(sec->data->d_buf + (reloc_idx (reloc) * sec->sh.sh_entsize) +4 ); + + insn =find_insn (file, reloc->sym->sec, + reloc->sym->offset +reloc_addend (reloc));
tools/objtool/check.c static int read_unwind_hints(struct objt · line 2413
Quoted 10 lines
tools/objtool/check.c +10
-0+if (!insn) { +WARN ("bad .discard.annotate entry: %d of type %d" ,reloc_idx (reloc), type); +return -1 ; + } + +func (type, insn); + } + +return 0 ; +}
Cheers,
Nathan
Peter Zijlstra
maintainerRe: [PATCH 1/9] objtool: Generic annotation infrastructure
Quoted 34 lines · Nathan Chancellor
Quoted 5 lines · Peter Zijlstra
Avoid endless .discard.foo sections for each annotation, create a single .discard.annotate section that takes an annotation type along with the instruction.
Signed-off-by Peter Zijlstra (Intel) <[email protected]>...
Quoted 14 lines
tools/objtool/check.c +8
-0@@ -2373,6 +2373,49 @@ static int read_unwind_hints(struct objtreturn 0 ; } +static int read_annotate (struct objtool_file *file,void (*func)(int type,struct instruction *insn)) +{ +struct section *sec; +struct instruction *insn; +struct reloc *reloc; +int type; + + sec =find_section_by_name (file->elf,".discard.annotate" );tools/objtool/check.c static int read_unwind_hints(struct objt · line 2393
Quoted 10 lines
tools/objtool/check.c +10
-0+if (!sec) +return 0 ; + +if (!sec->rsec) +return 0 ; + +if (sec->sh.sh_entsize !=8 ) { +static bool warned = false; +if (!warned) { +WARN ("%s: dodgy linker, sh_entsize != 8" , sec->name);Thanks to Fangrui, this has been resolved in LLVM main:
Quoted 5 lines
https://github.com/llvm/llvm-project/commit/d4bed617f4378873d7ddf4b53c041e7b39d1a9ca
https://github.com/ClangBuiltLinux/linux/issues/2057#issuecomment-2495675374I have built a version of LLVM from main and verified that this warning does not trigger with that version, while it does with LLVM 19.1.4.
Excellent, thanks for getting this sorted.
Since there's a fair number of llvm releases between the minimally supported version to build a kernel with and this fix, I'll leave the warning as non fatal.
One question; is there any other means of setting entsize aside from (ab)using SHF_MERGE ? The (GNU) as documetation for .section only mentions entsize in combination with SHF_MERGE.
Peter Zijlstra
maintainerPATCH 2/9 objtool: Convert ANNOTATE_NOENDBR to ANNOTATE
In reply to Peter Zijlstra--- include/linux/objtool.h | 17 ++++------------- include/linux/objtool_types.h | 5 +++++ tools/include/linux/objtool_types.h | 5 +++++ tools/objtool/check.c | 32 +++++--------------------------- 4 files changed, 19 insertions(+), 40 deletions(-)
include/linux/objtool.h +4 -13
@@ -45,12 +45,6 @@#define STACK_FRAME_NON_STANDARD_FP (func)#endif -#define ANNOTATE_NOENDBR \ - "986: \n\t" \ - ".pushsection .discard.noendbr\n\t" \ - ".long 986b\n\t" \ - ".popsection\n\t" -#define ASM_REACHABLE \ "998:\n\t" \ ".pushsection .discard.reachable\n\t" \
@@ -64,6 +58,8 @@ ".long " __stringify(x) "\n\t" \ ".popsection\n\t" +#define ANNOTATE_NOENDBR ASM_ANNOTATE(ANNOTYPE_NOENDBR) +#else /* __ASSEMBLY__ */ /*
@@ -122,13 +118,6 @@#endif .endm -.macro ANNOTATE_NOENDBR -.Lhere_\@: - .pushsection .discard.noendbr - .long .Lhere_\@ - .popsection -.endm -/* * Use objtool to validate the entry requirement that all code paths do * VALIDATE_UNRET_END before RET.
@@ -161,6 +150,8 @@ .popsection .endm +#define ANNOTATE_NOENDBR ANNOTATE type=ANNOTYPE_NOENDBR +#endif /* __ASSEMBLY__ */ #else /* !CONFIG_OBJTOOL */
include/linux/objtool_types.h +5 -0
@@ -54,4 +54,9 @@ struct unwind_hint {#define UNWIND_HINT_TYPE_SAVE 6#define UNWIND_HINT_TYPE_RESTORE 7 +/* +* Annotate types +*/ +#define ANNOTYPE_NOENDBR 1 +#endif /* _LINUX_OBJTOOL_TYPES_H */
tools/include/linux/objtool_types.h +5 -0
@@ -54,4 +54,9 @@ struct unwind_hint {#define UNWIND_HINT_TYPE_SAVE 6#define UNWIND_HINT_TYPE_RESTORE 7 +/* +* Annotate types +*/ +#define ANNOTYPE_NOENDBR 1 +#endif /* _LINUX_OBJTOOL_TYPES_H */
tools/objtool/check.c +5 -27
@@ -2412,32 +2412,12 @@ static int read_annotate(struct objtool_return 0 ; } -static void __annotate_nop (int type,struct instruction *insn) +static void __annotate_noendbr (int type,struct instruction *insn) { -} - -static int read_noendbr_hints (struct objtool_file *file) -{ -struct instruction *insn; -struct section *rsec; -struct reloc *reloc; - - rsec =find_section_by_name (file->elf,".rela.discard.noendbr" ); -if (!rsec) -return 0 ; +if (type !=ANNOTYPE_NOENDBR ) +return ; -for_each_reloc (rsec, reloc) { - insn =find_insn (file, reloc->sym->sec, - reloc->sym->offset +reloc_addend (reloc)); -if (!insn) { -WARN ("bad .discard.noendbr entry" ); -return -1 ; - } - - insn->noendbr =1 ; - } - -return 0 ; + insn->noendbr =1 ; }static int read_retpoline_hints (struct objtool_file *file)
@@ -2713,12 +2693,10 @@ static int decode_sections(struct objtooif (ret)return ret; -read_annotate (file, __annotate_nop); -/* * Must be before read_unwind_hints() since that needs insn->noendbr. */ - ret =read_noendbr_hints (file); + ret =read_annotate (file, __annotate_noendbr);if (ret)return ret;
Peter Zijlstra
maintainerPATCH 3/9 objtool: Convert ANNOTATE_RETPOLINE_SAFE to ANNOTATE
In reply to Peter Zijlstra--- arch/x86/include/asm/nospec-branch.h | 13 +------- include/linux/objtool_types.h | 1 tools/include/linux/objtool_types.h | 1 tools/objtool/check.c | 52 ++++++++++++----------------------- 4 files changed, 22 insertions(+), 45 deletions(-)
arch/x86/include/asm/nospec-branch.h +2 -11
@@ -184,12 +184,7 @@* objtool the subsequent indirect jump/call is vouched safe for retpoline * builds. */ -.macro ANNOTATE_RETPOLINE_SAFE -.Lhere_\@: - .pushsection .discard.retpoline_safe - .long .Lhere_\@ - .popsection -.endm +#define ANNOTATE_RETPOLINE_SAFE ANNOTATE type=ANNOTYPE_RETPOLINE_SAFE/* * (ab)use RETPOLINE_SAFE on RET to annotate away 'bare' RET instructions
@@ -350,11 +345,7 @@#else /* __ASSEMBLY__ */ -#define ANNOTATE_RETPOLINE_SAFE \ - "999:\n\t" \ - ".pushsection .discard.retpoline_safe\n\t" \ - ".long 999b\n\t" \ - ".popsection\n\t" +#define ANNOTATE_RETPOLINE_SAFE ASM_ANNOTATE(ANNOTYPE_RETPOLINE_SAFE)typedef u8 retpoline_thunk_t [RETPOLINE_THUNK_SIZE ];extern retpoline_thunk_t __x86_indirect_thunk_array[];
include/linux/objtool_types.h +1 -0
@@ -58,5 +58,6 @@ struct unwind_hint {* Annotate types */ #define ANNOTYPE_NOENDBR 1 +#define ANNOTYPE_RETPOLINE_SAFE 2#endif /* _LINUX_OBJTOOL_TYPES_H */
tools/include/linux/objtool_types.h +1 -0
@@ -58,5 +58,6 @@ struct unwind_hint {* Annotate types */ #define ANNOTYPE_NOENDBR 1 +#define ANNOTYPE_RETPOLINE_SAFE 2#endif /* _LINUX_OBJTOOL_TYPES_H */
tools/objtool/check.c +18 -34
90 lines not on this page · raw message
Peter Zijlstra
maintainerPATCH 4/9 objtool: Convert instrumentation_{begin,end}() to ANNOTATE
In reply to Peter Zijlstra--- include/linux/instrumentation.h | 12 ++++---- include/linux/objtool.h | 9 ++++-- include/linux/objtool_types.h | 2 + tools/include/linux/objtool_types.h | 2 + tools/objtool/check.c | 49 +++++++----------------------------- 5 files changed, 26 insertions(+), 48 deletions(-)
include/linux/instrumentation.h +6 -6
@@ -4,14 +4,15 @@#ifdef CONFIG_NOINSTR_VALIDATION +#include <linux/objtool.h> #include <linux/stringify.h> +#include <linux/args.h> /* Begin/end of an instrumentation safe region */ #define __instrumentation_begin (c) ({ \ asm volatile(__stringify(c) ": nop\n\t" \ - ".pushsection .discard.instr_begin\n\t" \ - ".long " __stringify(c) "b - .\n\t" \ - ".popsection\n\t" : : "i" (c)); \ + __ASM_ANNOTATE(CONCATENATE(c, b), ANNOTYPE_INSTR_BEGIN) \ + : : "i" (c)); \ })#define instrumentation_begin () __instrumentation_begin(__COUNTER__)
@@ -48,9 +49,8 @@*/ #define __instrumentation_end (c) ({ \ asm volatile(__stringify(c) ": nop\n\t" \ - ".pushsection .discard.instr_end\n\t" \ - ".long " __stringify(c) "b - .\n\t" \ - ".popsection\n\t" : : "i" (c)); \ + __ASM_ANNOTATE(CONCATENATE(c, b), ANNOTYPE_INSTR_END) \ + : : "i" (c)); \ })#define instrumentation_end () __instrumentation_end(__COUNTER__)#else /* !CONFIG_NOINSTR_VALIDATION */
include/linux/objtool.h +6 -3
@@ -51,13 +51,16 @@".long 998b\n\t" \ ".popsection\n\t" -#define ASM_ANNOTATE (x) \ - "911:\n\t" \ +#define __ASM_ANNOTATE (s, x) \ ".pushsection .discard.annotate,\"M\",@progbits,8\n\t" \ - ".long 911b - .\n\t" \ + ".long " __stringify(s) " - .\n\t" \ ".long " __stringify(x) "\n\t" \ ".popsection\n\t" +#define ASM_ANNOTATE (x) \ + "911:\n\t" \ + __ASM_ANNOTATE(911b, x) +#define ANNOTATE_NOENDBR ASM_ANNOTATE(ANNOTYPE_NOENDBR)#else /* __ASSEMBLY__ */
include/linux/objtool_types.h +2 -0
@@ -59,5 +59,7 @@ struct unwind_hint {*/ #define ANNOTYPE_NOENDBR 1#define ANNOTYPE_RETPOLINE_SAFE 2 +#define ANNOTYPE_INSTR_BEGIN 3 +#define ANNOTYPE_INSTR_END 4#endif /* _LINUX_OBJTOOL_TYPES_H */
tools/include/linux/objtool_types.h +2 -0
@@ -59,5 +59,7 @@ struct unwind_hint {*/ #define ANNOTYPE_NOENDBR 1#define ANNOTYPE_RETPOLINE_SAFE 2 +#define ANNOTYPE_INSTR_BEGIN 3 +#define ANNOTYPE_INSTR_END 4#endif /* _LINUX_OBJTOOL_TYPES_H */
tools/objtool/check.c +10 -39
65 lines not on this page · raw message
Peter Zijlstra
maintainerPATCH 5/9 objtool: Convert VALIDATE_UNRET_BEGIN to ANNOTATE
In reply to Peter Zijlstra--- include/linux/objtool.h | 9 +++------ include/linux/objtool_types.h | 1 + tools/include/linux/objtool_types.h | 1 + tools/objtool/check.c | 28 +++++----------------------- 4 files changed, 10 insertions(+), 29 deletions(-)
include/linux/objtool.h +3 -6
@@ -128,15 +128,12 @@* NOTE: The macro must be used at the beginning of a global symbol, otherwise * it will be ignored. */ -.macro VALIDATE_UNRET_BEGIN#if defined(CONFIG_NOINSTR_VALIDATION ) && \ (defined(CONFIG_MITIGATION_UNRET_ENTRY ) || defined(CONFIG_MITIGATION_SRSO )) -.Lhere_\@: - .pushsection .discard.validate_unret - .long .Lhere_\@ - . - .popsection +#define VALIDATE_UNRET_BEGIN ANNOTATE type=ANNOTYPE_UNRET_BEGIN +#else +#define VALIDATE_UNRET_BEGIN #endif -.endm .macro REACHABLE .Lhere_\@:
include/linux/objtool_types.h +1 -0
@@ -61,5 +61,6 @@ struct unwind_hint {#define ANNOTYPE_RETPOLINE_SAFE 2#define ANNOTYPE_INSTR_BEGIN 3#define ANNOTYPE_INSTR_END 4 +#define ANNOTYPE_UNRET_BEGIN 5#endif /* _LINUX_OBJTOOL_TYPES_H */
tools/include/linux/objtool_types.h +1 -0
@@ -61,5 +61,6 @@ struct unwind_hint {#define ANNOTYPE_RETPOLINE_SAFE 2#define ANNOTYPE_INSTR_BEGIN 3#define ANNOTYPE_INSTR_END 4 +#define ANNOTYPE_UNRET_BEGIN 5#endif /* _LINUX_OBJTOOL_TYPES_H */
tools/objtool/check.c +5 -23
@@ -2450,33 +2450,15 @@ static int __annotate_instr(int type, streturn 0 ; } -static int read_validate_unret_hints (struct objtool_file *file) +static int __annotate_unret (int type,struct instruction *insn) { -struct section *rsec; -struct instruction *insn; -struct reloc *reloc; - - rsec =find_section_by_name (file->elf,".rela.discard.validate_unret" ); -if (!rsec) +if (type !=ANNOTYPE_UNRET_BEGIN )return 0 ; -for_each_reloc (rsec, reloc) { -if (reloc->sym->type !=STT_SECTION ) { -WARN ("unexpected relocation symbol type in %s" , rsec->name); -return -1 ; - } - - insn =find_insn (file, reloc->sym->sec,reloc_addend (reloc)); -if (!insn) { -WARN ("bad .discard.instr_end entry" ); -return -1 ; - } - insn->unret =1 ; - } - + insn->unret =1 ;return 0 ; -} +}static int read_intra_function_calls (struct objtool_file *file) {
@@ -2697,7 +2679,7 @@ static int decode_sections(struct objtooif (ret)return ret; - ret =read_validate_unret_hints (file); + ret =read_annotate (file, __annotate_unret);if (ret)return ret;
Peter Zijlstra
maintainerPATCH 6/9 objtool: Convert ANNOTATE_IGNORE_ALTERNATIVE to ANNOTATE
In reply to Peter Zijlstra--- arch/x86/include/asm/alternative.h | 14 ++--------- include/linux/objtool_types.h | 1 tools/include/linux/objtool_types.h | 1 tools/objtool/check.c | 45 ++++++++---------------------------- 4 files changed, 15 insertions(+), 46 deletions(-)
arch/x86/include/asm/alternative.h +3 -11
@@ -4,6 +4,7 @@#include <linux/types.h> #include <linux/stringify.h> +#include <linux/objtool.h> #include <asm/asm.h> #define ALT_FLAGS_SHIFT 16
@@ -55,11 +56,7 @@* objtool annotation to ignore the alternatives and only consider the original * instruction(s). */ -#define ANNOTATE_IGNORE_ALTERNATIVE \ - "999:\n\t" \ - ".pushsection .discard.ignore_alts\n\t" \ - ".long 999b\n\t" \ - ".popsection\n\t" +#define ANNOTATE_IGNORE_ALTERNATIVE ASM_ANNOTATE(ANNOTYPE_IGNORE_ALTS)/* * The patching flags are part of the upper bits of the @ft_flags parameter when
@@ -349,12 +346,7 @@ static inline int alternatives_text_rese* objtool annotation to ignore the alternatives and only consider the original * instruction(s). */ -.macro ANNOTATE_IGNORE_ALTERNATIVE - .Lannotate_\@: - .pushsection .discard.ignore_alts - .long .Lannotate_\@ - .popsection -.endm +#define ANNOTATE_IGNORE_ALTERNATIVE ANNOTATE type=ANNOTYPE_IGNORE_ALTS/* * Issue one struct alt_instr descriptor entry (need to put it into
include/linux/objtool_types.h +1 -0
@@ -62,5 +62,6 @@ struct unwind_hint {#define ANNOTYPE_INSTR_BEGIN 3#define ANNOTYPE_INSTR_END 4#define ANNOTYPE_UNRET_BEGIN 5 +#define ANNOTYPE_IGNORE_ALTS 6#endif /* _LINUX_OBJTOOL_TYPES_H */
tools/include/linux/objtool_types.h +1 -0
@@ -62,5 +62,6 @@ struct unwind_hint {#define ANNOTYPE_INSTR_BEGIN 3#define ANNOTYPE_INSTR_END 4#define ANNOTYPE_UNRET_BEGIN 5 +#define ANNOTYPE_IGNORE_ALTS 6#endif /* _LINUX_OBJTOOL_TYPES_H */
tools/objtool/check.c +10 -35
63 lines not on this page · raw message
Peter Zijlstra
maintainerPATCH 7/9 objtool: Convert ANNOTATE_INTRA_FUNCTION_CALLS to ANNOTATE
In reply to Peter Zijlstra--- include/linux/objtool.h | 16 ++---- include/linux/objtool_types.h | 1 tools/include/linux/objtool_types.h | 1 tools/objtool/check.c | 96 ++++++++++++++---------------------- 4 files changed, 47 insertions(+), 67 deletions(-)
include/linux/objtool.h +6 -10
@@ -66,16 +66,6 @@#else /* __ASSEMBLY__ */ /* -* This macro indicates that the following intra-function call is valid. -* Any non-annotated intra-function call will cause objtool to issue a warning. -*/ -#define ANNOTATE_INTRA_FUNCTION_CALL \ - 999: \ - .pushsection .discard.intra_function_calls; \ - .long 999b; \ - .popsection; - -/* * In asm, there are two kinds of code: normal C-type callable functions and * the rest. The normal callable functions can be called by other code, and * don't do anything unusual with the stack. Such normal callable functions
@@ -152,6 +142,12 @@#define ANNOTATE_NOENDBR ANNOTATE type=ANNOTYPE_NOENDBR +/* +* This macro indicates that the following intra-function call is valid. +* Any non-annotated intra-function call will cause objtool to issue a warning. +*/ +#define ANNOTATE_INTRA_FUNCTION_CALL ANNOTATE type=ANNOTYPE_INTRA_FUNCTION_CALL +#endif /* __ASSEMBLY__ */ #else /* !CONFIG_OBJTOOL */
include/linux/objtool_types.h +1 -0
@@ -63,5 +63,6 @@ struct unwind_hint {#define ANNOTYPE_INSTR_END 4#define ANNOTYPE_UNRET_BEGIN 5#define ANNOTYPE_IGNORE_ALTS 6 +#define ANNOTYPE_INTRA_FUNCTION_CALL 7#endif /* _LINUX_OBJTOOL_TYPES_H */
tools/include/linux/objtool_types.h +1 -0
@@ -63,5 +63,6 @@ struct unwind_hint {#define ANNOTYPE_INSTR_END 4#define ANNOTYPE_UNRET_BEGIN 5#define ANNOTYPE_IGNORE_ALTS 6 +#define ANNOTYPE_INTRA_FUNCTION_CALL 7#endif /* _LINUX_OBJTOOL_TYPES_H */
tools/objtool/check.c +39 -57
150 lines not on this page · raw message
Re: [PATCH 7/9] objtool: Convert ANNOTATE_INTRA_FUNCTION_CALLS to ANNOTATE
Quoted 2 lines · Peter Zijlstra
Signed-off-by Peter Zijlstra (Intel) <[email protected]>
s/CALLS/CALL/ in $SUBJECT
Signature · 1 line
Josh
Peter Zijlstra
maintainerPATCH 8/9 objtool: Collapse annotate sequences
In reply to Peter ZijlstraReduce read_annotate() runs by collapsing subsequent runs into a single call.
--- tools/objtool/check.c | 87 ++++++++++++++++++-------------------------------- 1 file changed, 32 insertions(+), 55 deletions(-)
tools/objtool/check.c +32 -55
@@ -2308,21 +2308,24 @@ static int read_annotate(struct objtool_return 0 ; } -static int __annotate_ignore_alts (struct objtool_file *file,int type,struct instruction *insn) +static int __annotate_early (struct objtool_file *file,int type,struct instruction *insn) { -if (type !=ANNOTYPE_IGNORE_ALTS ) -return 0 ; +switch (type) { +case ANNOTYPE_IGNORE_ALTS : + insn->ignore_alts = true; +break ; - insn->ignore_alts = true; -return 0 ; -} +/* +* Must be before read_unwind_hints() since that needs insn->noendbr. +*/ +case ANNOTYPE_NOENDBR : + insn->noendbr =1 ; +break ; -static int __annotate_noendbr (struct objtool_file *file,int type,struct instruction *insn) -{ -if (type !=ANNOTYPE_NOENDBR ) -return 0 ; +default : +break ; + } - insn->noendbr =1 ;return 0 ; }
@@ -2356,26 +2359,21 @@ static int __annotate_ifc(struct objtoolreturn 0 ; } -static int __annotate_retpoline_safe (struct objtool_file *file,int type,struct instruction *insn) +static int __annotate_late (struct objtool_file *file,int type,struct instruction *insn) { -if (type !=ANNOTYPE_RETPOLINE_SAFE ) -return 0 ; - -if (insn->type !=INSN_JUMP_DYNAMIC && - insn->type !=INSN_CALL_DYNAMIC && - insn->type !=INSN_RETURN && - insn->type !=INSN_NOP ) { -WARN_INSN (insn,"retpoline_safe hint not an indirect jump/call/ret/nop" ); -return -1 ; - } +switch (type) { +case ANNOTYPE_RETPOLINE_SAFE : +if (insn->type !=INSN_JUMP_DYNAMIC && + insn->type !=INSN_CALL_DYNAMIC && + insn->type !=INSN_RETURN && + insn->type !=INSN_NOP ) { +WARN_INSN (insn,"retpoline_safe hint not an indirect jump/call/ret/nop" ); +return -1 ; + } - insn->retpoline_safe = true; -return 0 ; -} + insn->retpoline_safe = true; +break ; -static int __annotate_instr (struct objtool_file *file,int type,struct instruction *insn) -{ -switch (type) {case ANNOTYPE_INSTR_BEGIN : insn->instr++;break ;
@@ -2384,6 +2382,10 @@ static int __annotate_instr(struct objto insn->instr--;break ; +case ANNOTYPE_UNRET_BEGIN : + insn->unret =1 ; +break ; +default :break ; }
@@ -2391,16 +2393,6 @@ static int __annotate_instr(struct objtoreturn 0 ; } -static int __annotate_unret (struct objtool_file *file,int type,struct instruction *insn) -{ -if (type !=ANNOTYPE_UNRET_BEGIN ) -return 0 ; - - insn->unret =1 ; -return 0 ; - -} -/* * Return true if name matches an instrumentation function, where calls to that * function from noinstr code can safely be removed, but compilers won't do so.
@@ -2507,14 +2499,7 @@ static int decode_sections(struct objtooadd_ignores (file);add_uaccess_safe (file); - ret =read_annotate (file, __annotate_ignore_alts); -if (ret) -return ret; - -/* -* Must be before read_unwind_hints() since that needs insn->noendbr. -*/ - ret =read_annotate (file, __annotate_noendbr); + ret =read_annotate (file, __annotate_early);if (ret)return ret;
@@ -2560,15 +2545,7 @@ static int decode_sections(struct objtooif (ret)return ret; - ret =read_annotate (file, __annotate_retpoline_safe); -if (ret) -return ret; - - ret =read_annotate (file, __annotate_instr); -if (ret) -return ret; - - ret =read_annotate (file, __annotate_unret); + ret =read_annotate (file, __annotate_late);if (ret)return ret;
Re: [PATCH 8/9] objtool: Collapse annotate sequences
Quoted 5 lines · Peter Zijlstra
Reduce
read_annotate()runs by collapsing subsequent runs into a single call.
Stray link?
Signature · 1 line
Josh
Peter Zijlstra
maintainerRe: [PATCH 8/9] objtool: Collapse annotate sequences
Quoted 8 lines · Josh Poimboeuf
Quoted 5 lines · Peter Zijlstra
Reduce
read_annotate()runs by collapsing subsequent runs into a single call.Stray link?
Gah, yes, Was from the previous posting, I though I'd removed them all. Gone now.
Peter Zijlstra
maintainerPATCH 9/9 objtool: Collect all annotations in objtool.h
In reply to Peter Zijlstra--- arch/x86/include/asm/alternative.h | 12 ------------ arch/x86/include/asm/nospec-branch.h | 9 --------- include/linux/objtool.h | 30 +++++++++++++++++++++++------- 3 files changed, 23 insertions(+), 28 deletions(-)
arch/x86/include/asm/alternative.h +0 -12
@@ -56,12 +56,6 @@#endif /* -* objtool annotation to ignore the alternatives and only consider the original -* instruction(s). -*/ -#define ANNOTATE_IGNORE_ALTERNATIVE ASM_ANNOTATE(ANNOTYPE_IGNORE_ALTS) - -/* * The patching flags are part of the upper bits of the @ft_flags parameter when * specifying them. The split is currently like this: *
@@ -308,12 +302,6 @@ void nop_func(void);#endif /* -* objtool annotation to ignore the alternatives and only consider the original -* instruction(s). -*/ -#define ANNOTATE_IGNORE_ALTERNATIVE ANNOTATE type=ANNOTYPE_IGNORE_ALTS - -/* * Issue one struct alt_instr descriptor entry (need to put it into * the section .altinstructions, see below). This entry contains * enough information for the alternatives patching code to patch an
arch/x86/include/asm/nospec-branch.h +0 -9
@@ -180,13 +180,6 @@#ifdef __ASSEMBLY__/* -* This should be used immediately before an indirect jump/call. It tells -* objtool the subsequent indirect jump/call is vouched safe for retpoline -* builds. -*/ -#define ANNOTATE_RETPOLINE_SAFE ANNOTATE type=ANNOTYPE_RETPOLINE_SAFE - -/* * (ab)use RETPOLINE_SAFE on RET to annotate away 'bare' RET instructions * vs RETBleed validation. */
@@ -345,8 +338,6 @@#else /* __ASSEMBLY__ */ -#define ANNOTATE_RETPOLINE_SAFE ASM_ANNOTATE(ANNOTYPE_RETPOLINE_SAFE) -typedef u8 retpoline_thunk_t [RETPOLINE_THUNK_SIZE ];extern retpoline_thunk_t __x86_indirect_thunk_array[];extern retpoline_thunk_t __x86_indirect_call_thunk_array[];
include/linux/objtool.h +23 -7
@@ -61,8 +61,6 @@"911:\n\t" \ __ASM_ANNOTATE(911b, x) -#define ANNOTATE_NOENDBR ASM_ANNOTATE(ANNOTYPE_NOENDBR) -#else /* __ASSEMBLY__ */ /*
@@ -140,8 +138,6 @@ .popsection .endm -#define ANNOTATE_NOENDBR ANNOTATE type=ANNOTYPE_NOENDBR -/* * This macro indicates that the following intra-function call is valid. * Any non-annotated intra-function call will cause objtool to issue a warning.
@@ -158,7 +154,6 @@#define STACK_FRAME_NON_STANDARD (func)#define STACK_FRAME_NON_STANDARD_FP (func)#define ASM_ANNOTATE (x) -#define ANNOTATE_NOENDBR #define ASM_REACHABLE #else #define ANNOTATE_INTRA_FUNCTION_CALL
@@ -166,8 +161,6 @@ .endm .macro STACK_FRAME_NON_STANDARD func:req .endm -.macro ANNOTATE_NOENDBR -.endm .macro REACHABLE .endm .macro ANNOTATE type:req
@@ -176,4 +169,27 @@#endif /* CONFIG_OBJTOOL */ +#ifndef __ASSEMBLY__ +/* +* Annotate away the various 'relocation to !ENDBR` complaints; knowing that +* these relocations will never be used for indirect calls. +*/ +#define ANNOTATE_NOENDBR ASM_ANNOTATE(ANNOTYPE_NOENDBR) +/* +* This should be used immediately before an indirect jump/call. It tells +* objtool the subsequent indirect jump/call is vouched safe for retpoline +* builds. +*/ +#define ANNOTATE_RETPOLINE_SAFE ASM_ANNOTATE(ANNOTYPE_RETPOLINE_SAFE) +/* +* objtool annotation to ignore the alternatives and only consider the original +* instruction(s). +*/ +#define ANNOTATE_IGNORE_ALTERNATIVE ASM_ANNOTATE(ANNOTYPE_IGNORE_ALTS) +#else +#define ANNOTATE_NOENDBR ANNOTATE type=ANNOTYPE_NOENDBR +#define ANNOTATE_RETPOLINE_SAFE ANNOTATE type=ANNOTYPE_RETPOLINE_SAFE +#define ANNOTATE_IGNORE_ALTERNATIVE ANNOTATE type=ANNOTYPE_IGNORE_ALTS +#endif +#endif /* _LINUX_OBJTOOL_H */
Re: [PATCH 9/9] objtool: Collect all annotations in objtool.h
Quoted 7 lines · Peter Zijlstra
include/linux/objtool.h +7
-0+#ifndef __ASSEMBLY__ +/* +* Annotate away the various 'relocation to !ENDBR` complaints; knowing that +* these relocations will never be used for indirect calls. +*/ +#define ANNOTATE_NOENDBR ASM_ANNOTATE(ANNOTYPE_NOENDBR) +/*
include/linux/objtool.h line 188
Quoted 10 lines
include/linux/objtool.h +10
-0+* This should be used immediately before an indirect jump/call. It tells +* objtool the subsequent indirect jump/call is vouched safe for retpoline +* builds. +*/ +#define ANNOTATE_RETPOLINE_SAFE ASM_ANNOTATE(ANNOTYPE_RETPOLINE_SAFE) +/* +* objtool annotation to ignore the alternatives and only consider the original +* instruction(s). +*/ +#define ANNOTATE_IGNORE_ALTERNATIVE ASM_ANNOTATE(ANNOTYPE_IGNORE_ALTS)
This is a good start, though it would be really nice to have them *all* together:
- move ANNOTATE_INTRA_FUNCTION_CALL down next to those ^
- create ANNOTATE_INSTR_BEGIN and ANNOTATE_INSTR_END, and then do
#define instrumentation_begin() ANNOTATE_INSTR_BEGIN
to keep the existing syntax. Then instrumentation.h is no longer needed. The nice comment there can go above ANNOTATE_INSTR_BEGIN.
- similarly, create ANNOTATE_UNRET_BEGIN and just do
#define VALIDATE_UNRET_BEGIN ANNOTATE_UNRET_BEGIN
since the VALIDATE_* syntax is more descriptive.
So basically even the macros with non-ANNOTATE naming still resolve to ANNOTATE_FOO, with all the ANNOTATE_FOOs in one place, each with its own nice comment.
BTW, is there a reason .discard.[un]reachable weren't converted over?
Signature · 1 line
Josh
Peter Zijlstra
maintainerRe: [PATCH 9/9] objtool: Collect all annotations in objtool.h
Quoted 22 lines · Josh Poimboeuf
Quoted 7 lines · Peter Zijlstra
include/linux/objtool.h +7
-0+#ifndef __ASSEMBLY__ +/* +* Annotate away the various 'relocation to !ENDBR` complaints; knowing that +* these relocations will never be used for indirect calls. +*/ +#define ANNOTATE_NOENDBR ASM_ANNOTATE(ANNOTYPE_NOENDBR) +/* include/linux/objtool.h line 188
Quoted 10 lines
include/linux/objtool.h +10
-0+* This should be used immediately before an indirect jump/call. It tells +* objtool the subsequent indirect jump/call is vouched safe for retpoline +* builds. +*/ +#define ANNOTATE_RETPOLINE_SAFE ASM_ANNOTATE(ANNOTYPE_RETPOLINE_SAFE) +/* +* objtool annotation to ignore the alternatives and only consider the original +* instruction(s). +*/ +#define ANNOTATE_IGNORE_ALTERNATIVE ASM_ANNOTATE(ANNOTYPE_IGNORE_ALTS)This is a good start, though it would be really nice to have them *all* together:
Quoted 7 lines
- move
ANNOTATE_INTRA_FUNCTION_CALLdown next to those ^- similarly, create
ANNOTATE_UNRET_BEGINand just do#define
VALIDATE_UNRET_BEGINANNOTATE_UNRET_BEGINsince the VALIDATE_* syntax is more descriptive.
Done these two.
Quoted 6 lines
- create
ANNOTATE_INSTR_BEGINandANNOTATE_INSTR_END, and then do#define
instrumentation_begin()ANNOTATE_INSTR_BEGINto keep the existing syntax. Then
instrumentation.his no longer needed. The nice comment there can go aboveANNOTATE_INSTR_BEGIN.
Let me noodle a bit with this one, its a bit different from the rest.
Quoted 1 line
BTW, is there a reason .discard.[un]reachable weren't converted over?
Completely forgot/missed them. Let me add a patch.
Peter Zijlstra
maintainerRe: [PATCH 9/9] objtool: Collect all annotations in objtool.h
Quoted 3 lines · Peter Zijlstra
Quoted 1 line
BTW, is there a reason .discard.[un]reachable weren't converted over?
Completely forgot/missed them. Let me add a patch.
So this is turning into a bit of a trainwreck :/
That is, the below works, but I ended up having to include objtool.h from compiler.h, which is really unfortunate.
arch/loongarch/include/asm/bug.h +1 -0
@@ -4,6 +4,7 @@#include <asm/break.h> #include <linux/stringify.h> +#include <linux/objtool.h> #ifndef CONFIG_DEBUG_BUGVERBOSE #define _BUGVERBOSE_LOCATION (file, line)
arch/x86/entry/entry_64.S +2 -2
@@ -311,7 +311,7 @@ SYM_CODE_END(xen_error_entry) call \cfunc /* For some configurations \cfunc ends up being a noreturn. */ - REACHABLE + ANNOTATE_REACHABLE jmp error_return .endm
@@ -532,7 +532,7 @@ SYM_CODE_START(\asmsym) call \cfunc /* For some configurations \cfunc ends up being a noreturn. */ - REACHABLE + ANNOTATE_REACHABLE jmp paranoid_exit
arch/x86/include/asm/bug.h +1 -1
@@ -92,7 +92,7 @@ do { \do { \__auto_type __flags =BUGFLAG_WARNING |(flags); \instrumentation_begin (); \ -_BUG_FLAGS (ASM_UD2 , __flags,ASM_REACHABLE ); \ +_BUG_FLAGS (ASM_UD2 , __flags,ANNOTATE_REACHABLE ); \instrumentation_end (); \ }while (0 )
arch/x86/include/asm/irq_stack.h +1 -1
@@ -101,7 +101,7 @@#define ASM_CALL_ARG0 \ "call %c[__func] \n" \ - ASM_REACHABLE + ANNOTATE_REACHABLE#define ASM_CALL_ARG1 \ "movq %[arg1], %%rdi \n" \
include/linux/compiler.h +1 -27
@@ -3,6 +3,7 @@#define __LINUX_COMPILER_H#include <linux/compiler_types.h> +#include <linux/objtool.h> #ifndef __ASSEMBLY__
@@ -107,37 +108,10 @@ void ftrace_likely_update(struct ftrace_# define barrier_before_unreachable () do { } while (0)#endif -/* Unreachable code */ #ifdef CONFIG_OBJTOOL -/* -* These macros help objtool understand GCC code flow for unreachable code. -* The __COUNTER__ based labels are a hack to make each instance of the macros -* unique, to convince GCC not to merge duplicate inline asm statements. -*/ -#define __stringify_label (n) #n - -#define __annotate_reachable (c) ({ \ - asm volatile(__stringify_label(c) ":\n\t" \ - ".pushsection .discard.reachable\n\t" \ - ".long " __stringify_label(c) "b - .\n\t" \ - ".popsection\n\t"); \ -}) -#define annotate_reachable () __annotate_reachable(__COUNTER__) - -#define __annotate_unreachable (c) ({ \ - asm volatile(__stringify_label(c) ":\n\t" \ - ".pushsection .discard.unreachable\n\t" \ - ".long " __stringify_label(c) "b - .\n\t" \ - ".popsection\n\t" : : "i" (c)); \ -}) -#define annotate_unreachable () __annotate_unreachable(__COUNTER__) -/* Annotate a C jump table to allow objtool to follow the code flow */ #define __annotate_jump_table __section(".rodata..c_jump_table,\"a\",@progbits #") -#else /* !CONFIG_OBJTOOL */ -#define annotate_reachable () -#define annotate_unreachable ()#define __annotate_jump_table#endif /* CONFIG_OBJTOOL */
include/linux/instrumentation.h +2 -3
@@ -6,12 +6,11 @@#include <linux/objtool.h> #include <linux/stringify.h> -#include <linux/args.h> /* Begin/end of an instrumentation safe region */ #define __instrumentation_begin (c) ({ \ asm volatile(__stringify(c) ": nop\n\t" \ - __ASM_ANNOTATE(CONCATENATE(c, b), ANNOTYPE_INSTR_BEGIN) \ + __ASM_ANNOTATE(__ASM_BREF(c), ANNOTYPE_INSTR_BEGIN)\ : : "i" (c)); \ })#define instrumentation_begin () __instrumentation_begin(__COUNTER__)
@@ -49,7 +48,7 @@*/ #define __instrumentation_end (c) ({ \ asm volatile(__stringify(c) ": nop\n\t" \ - __ASM_ANNOTATE(CONCATENATE(c, b), ANNOTYPE_INSTR_END) \ + __ASM_ANNOTATE(__ASM_BREF(c), ANNOTYPE_INSTR_END) \ : : "i" (c)); \ })#define instrumentation_end () __instrumentation_end(__COUNTER__)
include/linux/objtool.h +22 -20
93 lines not on this page · raw message
include/linux/objtool_types.h +2 -0
@@ -64,5 +64,7 @@ struct unwind_hint {#define ANNOTYPE_UNRET_BEGIN 5#define ANNOTYPE_IGNORE_ALTS 6#define ANNOTYPE_INTRA_FUNCTION_CALL 7 +#define ANNOTYPE_REACHABLE 8 +#define ANNOTYPE_UNREACHABLE 9#endif /* _LINUX_OBJTOOL_TYPES_H */
tools/objtool/check.c +26 -99
161 lines not on this page · raw message
Peter Zijlstra
maintainerRe: [PATCH 9/9] objtool: Collect all annotations in objtool.h
Quoted 10 lines · Peter Zijlstra
Quoted 3 lines · Peter Zijlstra
Quoted 1 line
BTW, is there a reason .discard.[un]reachable weren't converted over?
Completely forgot/missed them. Let me add a patch.
So this is turning into a bit of a trainwreck :/
That is, the below works, but I ended up having to include
objtool.hfromcompiler.h, which is really unfortunate.
Or rather, I suppose I can move unreachable() into objtool.h (or another header entirely) and go include it from all the various files that call it.
Only ~70 files.
Peter Zijlstra
maintainerRe: [PATCH 9/9] objtool: Collect all annotations in objtool.h
Quoted 9 lines · Peter Zijlstra
Quoted 8 lines · Peter Zijlstra
Quoted 3 lines · Peter Zijlstra
Quoted 1 line
BTW, is there a reason .discard.[un]reachable weren't converted over?
Completely forgot/missed them. Let me add a patch.
So this is turning into a bit of a trainwreck :/
Quoted 8 lines
Quoted 2 lines
That is, the below works, but I ended up having to include
objtool.hfromcompiler.h, which is really unfortunate.Or rather, I suppose I can move
unreachable()intoobjtool.h(or another header entirely) and go include it from all the various files that call it.Only ~70 files.
OK, done that. Fed it to the robot, lets see what comes apart.
Quoted 9 lines · Peter Zijlstra
Just the objtool annotation rewrite bits.
Changes since last time:
- split from the x86 and kvm patches
- s/ANNOTYPE_INTRA_FUNCTION_CALLS/ANNOTYPE_INTRA_FUNCTION_CALL/g
- made__ASM_ANNOTATE()take a full label name (no longer appends 'b')
- added a patch that moves all the annotations toobjtool.h
- some changes to the first patch
For Valentin's thing we'll be adding annotations for static keys. Those will be symbol specific, like STACK_FRAME_NON_STANDARD(). In which case we could have a generic .discard.annotate_sym. And then rename .discard.annotate to .discard.annotate_insn?
Signature · 1 line
Josh
Peter Zijlstra
maintainerQuoted 11 lines · Josh Poimboeuf
Quoted 9 lines · Peter Zijlstra
Just the objtool annotation rewrite bits.
Changes since last time:
- split from the x86 and kvm patches
- s/ANNOTYPE_INTRA_FUNCTION_CALLS/ANNOTYPE_INTRA_FUNCTION_CALL/g
- made__ASM_ANNOTATE()take a full label name (no longer appends 'b')
- added a patch that moves all the annotations toobjtool.h
- some changes to the first patch
Quoted 4 lines
For Valentin's thing we'll be adding annotations for static keys. Those will be symbol specific, like
STACK_FRAME_NON_STANDARD(). In which case we could have a generic .discard.annotate_sym. And then rename .discard.annotate to .discard.annotate_insn?
Done.