objtool: Rewrite annotations
Peter Zijlstra
maintainerv2 cover objtool: Rewrite annotations
Rewrite/unify the objtool instruction based annotations.
Changes since last time:
- removed unreachable annotation
- included reachable annotation
- various smaller things
Peter Zijlstra
maintainerPATCH v2 1/16 objtool: Generic annotation infrastructure
Avoid endless .discard.foo sections for each annotation, create a single .discard.annotate_insn 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 (type) \ + "911:\n\t" \ + ".pushsection .discard.annotate_insn,\"M\",@progbits,8\n\t" \ + ".long 911b - .\n\t" \ + ".long " __stringify(type) "\n\t" \ + ".popsection\n\t" +#else /* __ASSEMBLY__ */ /*
@@ -146,6 +153,14 @@ .popsection .endm +.macro ANNOTATE type:req +.Lhere_\@: + .pushsection .discard.annotate_insn,"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 (type)#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
[tip: objtool/core] objtool: Generic annotation infrastructure
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 2116b349e29a2e9ba17ea2e45b31234e4b350793 Gitweb: https://git.kernel.org/tip/2116b349e29a2e9ba17ea2e45b31234e4b350793 Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 28 Nov 2024 10:38:52 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 02 Dec 2024 12:01:41 +01:00
objtool: Generic annotation infrastructure
Avoid endless .discard.foo sections for each annotation, create a single .discard.annotate_insn 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 (type) \ + "911:\n\t" \ + ".pushsection .discard.annotate_insn,\"M\",@progbits,8\n\t" \ + ".long 911b - .\n\t" \ + ".long " __stringify(type) "\n\t" \ + ".popsection\n\t" +#else /* __ASSEMBLY__ */ /*
@@ -146,6 +153,14 @@ .popsection .endm +.macro ANNOTATE type:req +.Lhere_\@: + .pushsection .discard.annotate_insn,"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 (type)#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
Peter Zijlstra
maintainerPATCH v2 2/16 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(type) "\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;
[tip: objtool/core] objtool: Convert ANNOTATE_NOENDBR to ANNOTATE
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 22c3d58079688b697f36d670616e463cbb14d058 Gitweb: https://git.kernel.org/tip/22c3d58079688b697f36d670616e463cbb14d058 Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 28 Nov 2024 10:38:53 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 02 Dec 2024 12:01:41 +01:00
objtool: Convert ANNOTATE_NOENDBR to ANNOTATE
--- 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(type) "\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_file *file, void (*func)(int type, strucreturn 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 ; - -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 ; - } +if (type !=ANNOTYPE_NOENDBR ) +return ; -return 0 ; + insn->noendbr =1 ; }static int read_retpoline_hints (struct objtool_file *file)
@@ -2713,12 +2693,10 @@ static int decode_sections(struct objtool_file *file)if (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 v2 3/16 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
[tip: objtool/core] objtool: Convert ANNOTATE_RETPOLINE_SAFE to ANNOTATE
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: bf5febebd99fddfc6226a94e937d38a8d470b24e Gitweb: https://git.kernel.org/tip/bf5febebd99fddfc6226a94e937d38a8d470b24e Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 28 Nov 2024 10:38:54 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 02 Dec 2024 12:01:41 +01:00
objtool: Convert ANNOTATE_RETPOLINE_SAFE to ANNOTATE
--- 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 v2 4/16 objtool: Convert instrumentation_{begin,end}() to ANNOTATE
In reply to Peter Zijlstra--- include/linux/instrumentation.h | 11 +++----- include/linux/objtool.h | 12 ++++++-- include/linux/objtool_types.h | 2 + tools/include/linux/objtool_types.h | 2 + tools/objtool/check.c | 49 +++++++----------------------------- 5 files changed, 28 insertions(+), 48 deletions(-)
include/linux/instrumentation.h +5 -6
@@ -4,14 +4,14 @@#ifdef CONFIG_NOINSTR_VALIDATION +#include <linux/objtool.h> #include <linux/stringify.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(__ASM_BREF(c), ANNOTYPE_INSTR_BEGIN)\ + : : "i" (c)); \ })#define instrumentation_begin () __instrumentation_begin(__COUNTER__)
@@ -48,9 +48,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(__ASM_BREF(c), ANNOTYPE_INSTR_END) \ + : : "i" (c)); \ })#define instrumentation_end () __instrumentation_end(__COUNTER__)#else /* !CONFIG_NOINSTR_VALIDATION */
include/linux/objtool.h +9 -3
@@ -51,13 +51,18 @@".long 998b\n\t" \ ".popsection\n\t" -#define ASM_ANNOTATE (type) \ - "911:\n\t" \ +#define __ASM_BREF (label) label ## b + +#define __ASM_ANNOTATE (label, type) \ ".pushsection .discard.annotate_insn,\"M\",@progbits,8\n\t" \ - ".long 911b - .\n\t" \ + ".long " __stringify(label) " - .\n\t" \ ".long " __stringify(type) "\n\t" \ ".popsection\n\t" +#define ASM_ANNOTATE (type) \ + "911:\n\t" \ + __ASM_ANNOTATE(911b, type) +#define ANNOTATE_NOENDBR ASM_ANNOTATE(ANNOTYPE_NOENDBR)#else /* __ASSEMBLY__ */
@@ -161,6 +166,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 (label, type)#define ASM_ANNOTATE (type)#define ANNOTATE_NOENDBR #define ASM_REACHABLE
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
[tip: objtool/core] objtool: Convert instrumentation_{begin,end}() to ANNOTATE
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 317f2a64618c528539d17fe6957a64106087fbd2 Gitweb: https://git.kernel.org/tip/317f2a64618c528539d17fe6957a64106087fbd2 Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 28 Nov 2024 10:38:55 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 02 Dec 2024 12:01:41 +01:00
objtool: Convert instrumentation_{begin,end}() to ANNOTATE
--- include/linux/instrumentation.h | 11 ++---- include/linux/objtool.h | 12 +++++-- include/linux/objtool_types.h | 2 +- tools/include/linux/objtool_types.h | 2 +- tools/objtool/check.c | 49 +++++----------------------- 5 files changed, 28 insertions(+), 48 deletions(-)
include/linux/instrumentation.h +5 -6
@@ -4,14 +4,14 @@#ifdef CONFIG_NOINSTR_VALIDATION +#include <linux/objtool.h> #include <linux/stringify.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(__ASM_BREF(c), ANNOTYPE_INSTR_BEGIN)\ + : : "i" (c)); \ })#define instrumentation_begin () __instrumentation_begin(__COUNTER__)
@@ -48,9 +48,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(__ASM_BREF(c), ANNOTYPE_INSTR_END) \ + : : "i" (c)); \ })#define instrumentation_end () __instrumentation_end(__COUNTER__)#else /* !CONFIG_NOINSTR_VALIDATION */
include/linux/objtool.h +9 -3
@@ -51,13 +51,18 @@".long 998b\n\t" \ ".popsection\n\t" -#define ASM_ANNOTATE (type) \ - "911:\n\t" \ +#define __ASM_BREF (label) label ## b + +#define __ASM_ANNOTATE (label, type) \ ".pushsection .discard.annotate_insn,\"M\",@progbits,8\n\t" \ - ".long 911b - .\n\t" \ + ".long " __stringify(label) " - .\n\t" \ ".long " __stringify(type) "\n\t" \ ".popsection\n\t" +#define ASM_ANNOTATE (type) \ + "911:\n\t" \ + __ASM_ANNOTATE(911b, type) +#define ANNOTATE_NOENDBR ASM_ANNOTATE(ANNOTYPE_NOENDBR)#else /* __ASSEMBLY__ */
@@ -161,6 +166,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 (label, type)#define ASM_ANNOTATE (type)#define ANNOTATE_NOENDBR #define ASM_REACHABLE
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 v2 5/16 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
@@ -130,15 +130,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
@@ -2458,33 +2458,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) {
@@ -2705,7 +2687,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;
[tip: objtool/core] objtool: Convert VALIDATE_UNRET_BEGIN to ANNOTATE
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 18aa6118a1689b4d73c5ebbd917ae3f20c9c0db1 Gitweb: https://git.kernel.org/tip/18aa6118a1689b4d73c5ebbd917ae3f20c9c0db1 Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 28 Nov 2024 10:38:56 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 02 Dec 2024 12:01:42 +01:00
objtool: Convert VALIDATE_UNRET_BEGIN to ANNOTATE
--- 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
@@ -130,15 +130,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
@@ -2458,33 +2458,15 @@ static int __annotate_instr(int type, struct instruction *insn)return 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) {
@@ -2705,7 +2687,7 @@ static int decode_sections(struct objtool_file *file)if (ret)return ret; - ret =read_validate_unret_hints (file); + ret =read_annotate (file, __annotate_unret);if (ret)return ret;
Peter Zijlstra
maintainerPATCH v2 6/16 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
@@ -58,11 +59,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
@@ -314,12 +311,7 @@ void nop_func(void);* 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
[tip: objtool/core] objtool: Convert ANNOTATE_IGNORE_ALTERNATIVE to ANNOTATE
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: f0cd57c35a75f152d3b31b9be3f7f413b96a6d3f Gitweb: https://git.kernel.org/tip/f0cd57c35a75f152d3b31b9be3f7f413b96a6d3f Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 28 Nov 2024 10:38:57 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 02 Dec 2024 12:01:42 +01:00
objtool: Convert ANNOTATE_IGNORE_ALTERNATIVE to ANNOTATE
--- 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
@@ -58,11 +59,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
@@ -314,12 +311,7 @@ void nop_func(void);* 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 v2 7/16 objtool: Convert ANNOTATE_INTRA_FUNCTION_CALL 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
@@ -68,16 +68,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
@@ -154,6 +144,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
[tip: objtool/core] objtool: Convert ANNOTATE_INTRA_FUNCTION_CALL to ANNOTATE
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 112765ca1cb9353e71b4f5af4e6e6c4a69c28d99 Gitweb: https://git.kernel.org/tip/112765ca1cb9353e71b4f5af4e6e6c4a69c28d99 Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 28 Nov 2024 10:38:58 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 02 Dec 2024 12:01:42 +01:00
objtool: Convert ANNOTATE_INTRA_FUNCTION_CALL to ANNOTATE
--- 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
@@ -68,16 +68,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
@@ -154,6 +144,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
Peter Zijlstra
maintainerPATCH v2 8/16 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
@@ -2381,21 +2381,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 ; }
@@ -2429,26 +2432,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 ;
@@ -2457,6 +2455,10 @@ static int __annotate_instr(struct objto insn->instr--;break ; +case ANNOTYPE_UNRET_BEGIN : + insn->unret =1 ; +break ; +default :break ; }
@@ -2464,16 +2466,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.
@@ -2583,14 +2575,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;
@@ -2636,15 +2621,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;
[tip: objtool/core] objtool: Collapse annotate sequences
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: a8a330dd9900024dc18b048c4f0f3c6ad22ff4c1 Gitweb: https://git.kernel.org/tip/a8a330dd9900024dc18b048c4f0f3c6ad22ff4c1 Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 28 Nov 2024 10:38:59 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 02 Dec 2024 12:01:42 +01:00
objtool: Collapse annotate sequences
Reduce 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
@@ -2381,21 +2381,24 @@ static int read_annotate(struct objtool_file *file,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 ; }
@@ -2429,26 +2432,21 @@ static int __annotate_ifc(struct objtool_file *file, int type, struct instructioreturn 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 ;
@@ -2457,6 +2455,10 @@ static int __annotate_instr(struct objtool_file *file, int type, struct instruct insn->instr--;break ; +case ANNOTYPE_UNRET_BEGIN : + insn->unret =1 ; +break ; +default :break ; }
@@ -2464,16 +2466,6 @@ static int __annotate_instr(struct objtool_file *file, int type, struct instructreturn 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.
@@ -2583,14 +2575,7 @@ static int decode_sections(struct objtool_file *file)add_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;
@@ -2636,15 +2621,7 @@ static int decode_sections(struct objtool_file *file)if (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;
Peter Zijlstra
maintainerPATCH v2 9/16 objtool: Collect more 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/instrumentation.h | 4 - include/linux/objtool.h | 80 +++++++++++++++++++++++------------ 4 files changed, 55 insertions(+), 50 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/instrumentation.h +2 -2
@@ -10,7 +10,7 @@/* Begin/end of an instrumentation safe region */ #define __instrumentation_begin (c) ({ \ asm volatile(__stringify(c) ": nop\n\t" \ - __ASM_ANNOTATE(__ASM_BREF(c), ANNOTYPE_INSTR_BEGIN)\ + ANNOTATE_INSTR_BEGIN(__ASM_BREF(c)) \ : : "i" (c)); \ })#define instrumentation_begin () __instrumentation_begin(__COUNTER__)
@@ -48,7 +48,7 @@*/ #define __instrumentation_end (c) ({ \ asm volatile(__stringify(c) ": nop\n\t" \ - __ASM_ANNOTATE(__ASM_BREF(c), ANNOTYPE_INSTR_END) \ + ANNOTATE_INSTR_END(__ASM_BREF(c)) \ : : "i" (c)); \ })#define instrumentation_end () __instrumentation_end(__COUNTER__)
include/linux/objtool.h +53 -27
114 lines not on this page · raw message
[tip: objtool/core] objtool: Collect more annotations in objtool.h
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: bb8170067470cc7af28e4386e600b1e0a6a8956a Gitweb: https://git.kernel.org/tip/bb8170067470cc7af28e4386e600b1e0a6a8956a Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 28 Nov 2024 10:39:00 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 02 Dec 2024 12:01:43 +01:00
objtool: Collect more annotations in objtool.h
--- arch/x86/include/asm/alternative.h | 12 +---- arch/x86/include/asm/nospec-branch.h | 9 +--- include/linux/instrumentation.h | 4 +- include/linux/objtool.h | 80 +++++++++++++++++---------- 4 files changed, 55 insertions(+), 50 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/instrumentation.h +2 -2
@@ -10,7 +10,7 @@/* Begin/end of an instrumentation safe region */ #define __instrumentation_begin (c) ({ \ asm volatile(__stringify(c) ": nop\n\t" \ - __ASM_ANNOTATE(__ASM_BREF(c), ANNOTYPE_INSTR_BEGIN)\ + ANNOTATE_INSTR_BEGIN(__ASM_BREF(c)) \ : : "i" (c)); \ })#define instrumentation_begin () __instrumentation_begin(__COUNTER__)
@@ -48,7 +48,7 @@*/ #define __instrumentation_end (c) ({ \ asm volatile(__stringify(c) ": nop\n\t" \ - __ASM_ANNOTATE(__ASM_BREF(c), ANNOTYPE_INSTR_END) \ + ANNOTATE_INSTR_END(__ASM_BREF(c)) \ : : "i" (c)); \ })#define instrumentation_end () __instrumentation_end(__COUNTER__)
include/linux/objtool.h +53 -27
114 lines not on this page · raw message
Peter Zijlstra
maintainerPATCH v2 10/16 unreachable: Unify
In reply to Peter ZijlstraSince barrier_before_unreachable() is empty for !GCC it is trivial to unify the two definitions. Less is more.
--- include/linux/compiler-gcc.h | 12 ------------ include/linux/compiler.h | 10 +++++++--- 2 files changed, 7 insertions(+), 15 deletions(-)
include/linux/compiler-gcc.h +0 -12
@@ -52,18 +52,6 @@*/ #define barrier_before_unreachable () asm volatile("") -/* -* Mark a position in code as unreachable. This can be used to -* suppress control flow warnings after asm blocks that transfer -* control elsewhere. -*/ -#define unreachable () \ - do { \ - annotate_unreachable(); \ - barrier_before_unreachable(); \ - __builtin_unreachable(); \ - } while (0) -#if defined(CONFIG_ARCH_USE_BUILTIN_BSWAP )#define __HAVE_BUILTIN_BSWAP32__#define __HAVE_BUILTIN_BSWAP64__
include/linux/compiler.h +7 -3
@@ -141,12 +141,16 @@ void ftrace_likely_update(struct ftrace_#define __annotate_jump_table#endif /* CONFIG_OBJTOOL */ -#ifndef unreachable -# define unreachable () do { \ +/* +* Mark a position in code as unreachable. This can be used to +* suppress control flow warnings after asm blocks that transfer +* control elsewhere. +*/ +#define unreachable () do { \ annotate_unreachable(); \ + barrier_before_unreachable(); \ __builtin_unreachable(); \ } while (0) -#endif /* * KENTRY - kernel entry point
[tip: objtool/core] unreachable: Unify
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: c837de3810982cd41cd70e5170da1931439f025c Gitweb: https://git.kernel.org/tip/c837de3810982cd41cd70e5170da1931439f025c Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 28 Nov 2024 10:39:01 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 02 Dec 2024 12:01:43 +01:00
unreachable: Unify
Since barrier_before_unreachable() is empty for !GCC it is trivial to unify the two definitions. Less is more.
--- include/linux/compiler-gcc.h | 12 ------------ include/linux/compiler.h | 10 +++++++--- 2 files changed, 7 insertions(+), 15 deletions(-)
include/linux/compiler-gcc.h +0 -12
@@ -52,18 +52,6 @@*/ #define barrier_before_unreachable () asm volatile("") -/* -* Mark a position in code as unreachable. This can be used to -* suppress control flow warnings after asm blocks that transfer -* control elsewhere. -*/ -#define unreachable () \ - do { \ - annotate_unreachable(); \ - barrier_before_unreachable(); \ - __builtin_unreachable(); \ - } while (0) -#if defined(CONFIG_ARCH_USE_BUILTIN_BSWAP )#define __HAVE_BUILTIN_BSWAP32__#define __HAVE_BUILTIN_BSWAP64__
include/linux/compiler.h +7 -3
@@ -141,12 +141,16 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,#define __annotate_jump_table#endif /* CONFIG_OBJTOOL */ -#ifndef unreachable -# define unreachable () do { \ +/* +* Mark a position in code as unreachable. This can be used to +* suppress control flow warnings after asm blocks that transfer +* control elsewhere. +*/ +#define unreachable () do { \ annotate_unreachable(); \ + barrier_before_unreachable(); \ __builtin_unreachable(); \ } while (0) -#endif /* * KENTRY - kernel entry point
Peter Zijlstra
maintainerPATCH v2 11/16 x86: Convert unreachable() to BUG()
In reply to Peter ZijlstraAvoid unreachable() as it can (and will in the absence of UBSAN) generate fallthrough code. Use BUG() so we get a UD2 trap (with unreachable annotation).
--- arch/x86/kernel/process.c | 2 +- arch/x86/kernel/reboot.c | 2 +- arch/x86/kvm/svm/sev.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/process.c +1 -1
@@ -838,7 +838,7 @@ void __noreturn stop_this_cpu(void *dumm#ifdef CONFIG_SMP if (smp_ops.stop_this_cpu) { smp_ops.stop_this_cpu (); -unreachable (); +BUG (); }#endif
arch/x86/kernel/reboot.c +1 -1
@@ -883,7 +883,7 @@ static int crash_nmi_callback(unsigned iif (smp_ops.stop_this_cpu) { smp_ops.stop_this_cpu (); -unreachable (); +BUG (); }/* Assume hlt works */
arch/x86/kvm/svm/sev.c +1 -1
@@ -3820,7 +3820,7 @@ static int snp_begin_psc(struct vcpu_svm goto next_range; } -unreachable (); +BUG (); }static int __sev_snp_update_protected_guest_state (struct kvm_vcpu *vcpu)
[tip: objtool/core] x86: Convert unreachable() to BUG()
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 2190966fbc14ca2cd4ea76eefeb96a47d8e390df Gitweb: https://git.kernel.org/tip/2190966fbc14ca2cd4ea76eefeb96a47d8e390df Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 28 Nov 2024 10:39:02 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 02 Dec 2024 12:01:43 +01:00
x86: Convert unreachable() to BUG()
Avoid unreachable() as it can (and will in the absence of UBSAN) generate fallthrough code. Use BUG() so we get a UD2 trap (with unreachable annotation).
--- arch/x86/kernel/process.c | 2 +- arch/x86/kernel/reboot.c | 2 +- arch/x86/kvm/svm/sev.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/process.c +1 -1
@@ -838,7 +838,7 @@ void __noreturn stop_this_cpu(void *dummy)#ifdef CONFIG_SMP if (smp_ops.stop_this_cpu) { smp_ops.stop_this_cpu (); -unreachable (); +BUG (); }#endif
arch/x86/kernel/reboot.c +1 -1
@@ -883,7 +883,7 @@ static int crash_nmi_callback(unsigned int val, struct pt_regs *regs)if (smp_ops.stop_this_cpu) { smp_ops.stop_this_cpu (); -unreachable (); +BUG (); }/* Assume hlt works */
arch/x86/kvm/svm/sev.c +1 -1
@@ -3820,7 +3820,7 @@ next_range: goto next_range; } -unreachable (); +BUG (); }static int __sev_snp_update_protected_guest_state (struct kvm_vcpu *vcpu)
Peter Zijlstra
maintainerRe: [tip: objtool/core] x86: Convert unreachable() to BUG()
Quoted 11 lines · On Mon, Dec 02, 2024 at 11:15:21AM -0000, tip-bot2 for Peter Zijlstra wrote:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 2190966fbc14ca2cd4ea76eefeb96a47d8e390df Gitweb: https://git.kernel.org/tip/2190966fbc14ca2cd4ea76eefeb96a47d8e390df Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 28 Nov 2024 10:39:02 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 02 Dec 2024 12:01:43 +01:00x86: Convert
unreachable()toBUG()
Quoted 7 lines
Avoid
unreachable()as it can (and will in the absence of UBSAN) generate fallthrough code. UseBUG()so we get a UD2 trap (with unreachable annotation).
Urgh, one got lost:
vmlinux.o: warning: objtool: page_fault_oops() falls through to next function is_prefetch()
--- arch/x86/mm/fault.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/mm/fault.c +1 -1
@@ -678,7 +678,7 @@ page_fault_oops(struct pt_regs *regs, unsigned long error_code, ASM_CALL_ARG3, , [arg1] "r" (regs), [arg2] "r" (address), [arg3] "r" (&info)); - unreachable(); + BUG(); }#endif
[tip: objtool/core] x86/mm: Convert unreachable() to BUG()
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 41a1e976623eb430f7b5a8619d3810b44e6235ad Gitweb: https://git.kernel.org/tip/41a1e976623eb430f7b5a8619d3810b44e6235ad Author: Peter Zijlstra <[email protected]> AuthorDate: Mon, 16 Dec 2024 11:08:12 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Tue, 17 Dec 2024 17:47:21 +01:00
x86/mm: Convert unreachable() to BUG()
Commit 2190966fbc14 ("x86: Convert unreachable() to BUG()") missed one.
And after commit 06e24745985c ("objtool: Remove annotate_{,un}reachable()") the invalid use of unreachable() (rightfully) triggers warnings:
vmlinux.o: warning: objtool: page_fault_oops() falls through to next function is_prefetch()
--- arch/x86/mm/fault.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/mm/fault.c +1 -1
@@ -678,7 +678,7 @@ page_fault_oops(struct pt_regs *regs, unsigned long error_code, ASM_CALL_ARG3, , [arg1] "r" (regs), [arg2] "r" (address), [arg3] "r" (&info)); - unreachable(); + BUG(); }#endif
Peter Zijlstra
maintainerPATCH v2 12/16 loongarch: Use ASM_REACHABLE
In reply to Peter Zijlstraannotate_reachable() is unreliable since the compiler is free to place random code inbetween two consecutive asm() statements.
This removes the last and only annotate_reachable() user.
--- arch/loongarch/include/asm/bug.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
arch/loongarch/include/asm/bug.h +7 -6
@@ -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)
@@ -33,25 +34,25 @@#define ASM_BUG_FLAGS (flags) \ __BUG_ENTRY(flags) \ - break BRK_BUG + break BRK_BUG;#define ASM_BUG () ASM_BUG_FLAGS(0) -#define __BUG_FLAGS (flags) \ - asm_inline volatile (__stringify(ASM_BUG_FLAGS(flags))); +#define __BUG_FLAGS (flags, extra) \ + asm_inline volatile (__stringify(ASM_BUG_FLAGS(flags)) \ + extra);#define __WARN_FLAGS (flags) \ do { \ instrumentation_begin(); \ - __BUG_FLAGS(BUGFLAG_WARNING|(flags)); \ - annotate_reachable(); \ + __BUG_FLAGS(BUGFLAG_WARNING|(flags), ASM_REACHABLE); \ instrumentation_end(); \ } while (0)#define BUG () \ do { \ instrumentation_begin(); \ - __BUG_FLAGS(0); \ + __BUG_FLAGS(0, ""); \ unreachable(); \ } while (0)
[tip: objtool/core] loongarch: Use ASM_REACHABLE
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 624bde3465f660e54a7cd4c1efc3e536349fead5 Gitweb: https://git.kernel.org/tip/624bde3465f660e54a7cd4c1efc3e536349fead5 Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 28 Nov 2024 10:39:03 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 02 Dec 2024 12:01:44 +01:00
loongarch: Use ASM_REACHABLE
annotate_reachable() is unreliable since the compiler is free to place random code inbetween two consecutive asm() statements.
This removes the last and only annotate_reachable() user.
--- arch/loongarch/include/asm/bug.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
arch/loongarch/include/asm/bug.h +7 -6
@@ -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)
@@ -33,25 +34,25 @@#define ASM_BUG_FLAGS (flags) \ __BUG_ENTRY(flags) \ - break BRK_BUG + break BRK_BUG;#define ASM_BUG () ASM_BUG_FLAGS(0) -#define __BUG_FLAGS (flags) \ - asm_inline volatile (__stringify(ASM_BUG_FLAGS(flags))); +#define __BUG_FLAGS (flags, extra) \ + asm_inline volatile (__stringify(ASM_BUG_FLAGS(flags)) \ + extra);#define __WARN_FLAGS (flags) \ do { \ instrumentation_begin(); \ - __BUG_FLAGS(BUGFLAG_WARNING|(flags)); \ - annotate_reachable(); \ + __BUG_FLAGS(BUGFLAG_WARNING|(flags), ASM_REACHABLE); \ instrumentation_end(); \ } while (0)#define BUG () \ do { \ instrumentation_begin(); \ - __BUG_FLAGS(0); \ + __BUG_FLAGS(0, ""); \ unreachable(); \ } while (0)
Peter Zijlstra
maintainerPATCH v2 13/16 objtool: Remove annotate_{,un}reachable()
In reply to Peter ZijlstraThere are no users of annotate_reachable() left.
And the annotate_unreachable() usage in unreachable() is plain wrong; it will hide dangerous fall-through code-gen.
Remove both.
--- include/linux/compiler.h | 27 --------------------------- tools/objtool/check.c | 43 ++----------------------------------------- 2 files changed, 2 insertions(+), 68 deletions(-)
include/linux/compiler.h +0 -27
@@ -109,35 +109,9 @@ void ftrace_likely_update(struct ftrace_/* 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 */
@@ -147,7 +121,6 @@ void ftrace_likely_update(struct ftrace_* control elsewhere. */ #define unreachable () do { \ - annotate_unreachable(); \ barrier_before_unreachable(); \ __builtin_unreachable(); \ } while (0)
tools/objtool/check.c +2 -41
49 lines not on this page · raw message
[tip: objtool/core] objtool: Remove annotate_{,un}reachable()
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 06e24745985c8dd0da18337503afcf2f2fdbdff1 Gitweb: https://git.kernel.org/tip/06e24745985c8dd0da18337503afcf2f2fdbdff1 Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 28 Nov 2024 10:39:04 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 02 Dec 2024 12:01:44 +01:00
objtool: Remove annotate_{,un}reachable()
There are no users of annotate_reachable() left.
And the annotate_unreachable() usage in unreachable() is plain wrong; it will hide dangerous fall-through code-gen.
Remove both.
--- include/linux/compiler.h | 27 +------------------------ tools/objtool/check.c | 43 +-------------------------------------- 2 files changed, 2 insertions(+), 68 deletions(-)
include/linux/compiler.h +0 -27
@@ -109,35 +109,9 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,/* 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 */
@@ -147,7 +121,6 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,* control elsewhere. */ #define unreachable () do { \ - annotate_unreachable(); \ barrier_before_unreachable(); \ __builtin_unreachable(); \ } while (0)
tools/objtool/check.c +2 -41
49 lines not on this page · raw message
Peter Zijlstra
maintainerPATCH v2 14/16 objtool: Convert {.UN}REACHABLE to ANNOTATE
In reply to Peter Zijlstra--- arch/loongarch/include/asm/bug.h | 2 arch/x86/entry/entry_64.S | 4 - arch/x86/include/asm/bug.h | 2 arch/x86/include/asm/irq_stack.h | 2 include/linux/objtool.h | 18 +++---- include/linux/objtool_types.h | 1 tools/include/linux/objtool_types.h | 1 tools/objtool/check.c | 82 +++++++++--------------------------- 8 files changed, 36 insertions(+), 76 deletions(-)
arch/loongarch/include/asm/bug.h +1 -1
@@ -45,7 +45,7 @@#define __WARN_FLAGS (flags) \ do { \ instrumentation_begin(); \ - __BUG_FLAGS(BUGFLAG_WARNING|(flags), ASM_REACHABLE); \ + __BUG_FLAGS(BUGFLAG_WARNING|(flags), ANNOTATE_REACHABLE);\ instrumentation_end(); \ } while (0)
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/objtool.h +7 -11
@@ -111,14 +111,6 @@#endif .endm - -.macro REACHABLE -.Lhere_\@: - .pushsection .discard.reachable - .long .Lhere_\@ - .popsection -.endm - .macro ANNOTATE type:req .Lhere_\@: .pushsection .discard.annotate_insn,"M",@progbits,8
@@ -138,14 +130,11 @@#define STACK_FRAME_NON_STANDARD_FP (func)#define __ASM_ANNOTATE (label, type)#define ASM_ANNOTATE (type) -#define ASM_REACHABLE #else .macro UNWIND_HINT type:req sp_reg=0 sp_offset=0 signal=0 .endm .macro STACK_FRAME_NON_STANDARD func:req .endm -.macro REACHABLE -.endm .macro ANNOTATE type:req .endm #endif
@@ -187,6 +176,12 @@* it will be ignored. */ #define ANNOTATE_UNRET_BEGIN ASM_ANNOTATE(ANNOTYPE_UNRET_BEGIN) +/* +* This should be used directly after an instruction that is considered +* terminating, like a noreturn CALL or UD2 when we know they are not -- eg +* WARN using UD2. +*/ +#define ANNOTATE_REACHABLE ASM_ANNOTATE(ANNOTYPE_REACHABLE)#else #define ANNOTATE_NOENDBR ANNOTATE type=ANNOTYPE_NOENDBR
@@ -196,6 +191,7 @@#define ANNOTATE_IGNORE_ALTERNATIVE ANNOTATE type=ANNOTYPE_IGNORE_ALTS#define ANNOTATE_INTRA_FUNCTION_CALL ANNOTATE type=ANNOTYPE_INTRA_FUNCTION_CALL#define ANNOTATE_UNRET_BEGIN ANNOTATE type=ANNOTYPE_UNRET_BEGIN +#define ANNOTATE_REACHABLE ANNOTATE type=ANNOTYPE_REACHABLE#endif #if defined(CONFIG_NOINSTR_VALIDATION) && \
include/linux/objtool_types.h +1 -0
@@ -64,5 +64,6 @@ struct unwind_hint {#define ANNOTYPE_UNRET_BEGIN 5#define ANNOTYPE_IGNORE_ALTS 6#define ANNOTYPE_INTRA_FUNCTION_CALL 7 +#define ANNOTYPE_REACHABLE 8#endif /* _LINUX_OBJTOOL_TYPES_H */
tools/include/linux/objtool_types.h +1 -0
@@ -64,5 +64,6 @@ struct unwind_hint {#define ANNOTYPE_UNRET_BEGIN 5#define ANNOTYPE_IGNORE_ALTS 6#define ANNOTYPE_INTRA_FUNCTION_CALL 7 +#define ANNOTYPE_REACHABLE 8#endif /* _LINUX_OBJTOOL_TYPES_H */
tools/objtool/check.c +22 -60
118 lines not on this page · raw message
[tip: objtool/core] objtool: Convert {.UN}REACHABLE to ANNOTATE
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: e7a174fb43d24adca066e82d1cb9fdee092d48d1 Gitweb: https://git.kernel.org/tip/e7a174fb43d24adca066e82d1cb9fdee092d48d1 Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 28 Nov 2024 10:39:05 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 02 Dec 2024 12:01:44 +01:00
objtool: Convert {.UN}REACHABLE to ANNOTATE
--- arch/loongarch/include/asm/bug.h | 2 +- arch/x86/entry/entry_64.S | 4 +- arch/x86/include/asm/bug.h | 2 +- arch/x86/include/asm/irq_stack.h | 2 +- include/linux/objtool.h | 18 ++---- include/linux/objtool_types.h | 1 +- tools/include/linux/objtool_types.h | 1 +- tools/objtool/check.c | 82 +++++++--------------------- 8 files changed, 36 insertions(+), 76 deletions(-)
arch/loongarch/include/asm/bug.h +1 -1
@@ -45,7 +45,7 @@#define __WARN_FLAGS (flags) \ do { \ instrumentation_begin(); \ - __BUG_FLAGS(BUGFLAG_WARNING|(flags), ASM_REACHABLE); \ + __BUG_FLAGS(BUGFLAG_WARNING|(flags), ANNOTATE_REACHABLE);\ instrumentation_end(); \ } while (0)
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/objtool.h +7 -11
@@ -111,14 +111,6 @@#endif .endm - -.macro REACHABLE -.Lhere_\@: - .pushsection .discard.reachable - .long .Lhere_\@ - .popsection -.endm - .macro ANNOTATE type:req .Lhere_\@: .pushsection .discard.annotate_insn,"M",@progbits,8
@@ -138,14 +130,11 @@#define STACK_FRAME_NON_STANDARD_FP (func)#define __ASM_ANNOTATE (label, type)#define ASM_ANNOTATE (type) -#define ASM_REACHABLE #else .macro UNWIND_HINT type:req sp_reg=0 sp_offset=0 signal=0 .endm .macro STACK_FRAME_NON_STANDARD func:req .endm -.macro REACHABLE -.endm .macro ANNOTATE type:req .endm #endif
@@ -187,6 +176,12 @@* it will be ignored. */ #define ANNOTATE_UNRET_BEGIN ASM_ANNOTATE(ANNOTYPE_UNRET_BEGIN) +/* +* This should be used directly after an instruction that is considered +* terminating, like a noreturn CALL or UD2 when we know they are not -- eg +* WARN using UD2. +*/ +#define ANNOTATE_REACHABLE ASM_ANNOTATE(ANNOTYPE_REACHABLE)#else #define ANNOTATE_NOENDBR ANNOTATE type=ANNOTYPE_NOENDBR
@@ -196,6 +191,7 @@#define ANNOTATE_IGNORE_ALTERNATIVE ANNOTATE type=ANNOTYPE_IGNORE_ALTS#define ANNOTATE_INTRA_FUNCTION_CALL ANNOTATE type=ANNOTYPE_INTRA_FUNCTION_CALL#define ANNOTATE_UNRET_BEGIN ANNOTATE type=ANNOTYPE_UNRET_BEGIN +#define ANNOTATE_REACHABLE ANNOTATE type=ANNOTYPE_REACHABLE#endif #if defined(CONFIG_NOINSTR_VALIDATION) && \
include/linux/objtool_types.h +1 -0
@@ -64,5 +64,6 @@ struct unwind_hint {#define ANNOTYPE_UNRET_BEGIN 5#define ANNOTYPE_IGNORE_ALTS 6#define ANNOTYPE_INTRA_FUNCTION_CALL 7 +#define ANNOTYPE_REACHABLE 8#endif /* _LINUX_OBJTOOL_TYPES_H */
tools/include/linux/objtool_types.h +1 -0
@@ -64,5 +64,6 @@ struct unwind_hint {#define ANNOTYPE_UNRET_BEGIN 5#define ANNOTYPE_IGNORE_ALTS 6#define ANNOTYPE_INTRA_FUNCTION_CALL 7 +#define ANNOTYPE_REACHABLE 8#endif /* _LINUX_OBJTOOL_TYPES_H */
tools/objtool/check.c +22 -60
118 lines not on this page · raw message
Peter Zijlstra
maintainerPATCH v2 15/16 objtool: Fix ANNOTATE_REACHABLE to be a normal annotation
In reply to Peter ZijlstraCurrently REACHABLE is weird for being on the instruction after the instruction it modifies.
Since all REACHABLE annotations have an explicit instruction, flip them around.
--- arch/loongarch/include/asm/bug.h | 2 +- arch/x86/entry/entry_64.S | 5 ++--- arch/x86/include/asm/bug.h | 2 +- arch/x86/include/asm/irq_stack.h | 4 ++-- include/linux/objtool.h | 4 ++-- tools/objtool/check.c | 23 ----------------------- 6 files changed, 8 insertions(+), 32 deletions(-)
arch/loongarch/include/asm/bug.h +1 -1
@@ -45,7 +45,7 @@#define __WARN_FLAGS (flags) \ do { \ instrumentation_begin(); \ - __BUG_FLAGS(BUGFLAG_WARNING|(flags), ANNOTATE_REACHABLE);\ + __BUG_FLAGS(BUGFLAG_WARNING|(flags), ANNOTATE_REACHABLE(10001b));\ instrumentation_end(); \ } while (0)
arch/x86/entry/entry_64.S +2 -3
@@ -308,10 +308,9 @@ SYM_CODE_END(xen_error_entry) movq $-1, ORIG_RAX(%rsp) /* no syscall to restart */ .endif - call \cfunc - /* For some configurations \cfunc ends up being a noreturn. */ ANNOTATE_REACHABLE + call \cfunc jmp error_return .endm
@@ -529,10 +528,10 @@ SYM_CODE_START(\asmsym) movq %rsp, %rdi /* pt_regs pointer into first argument */ movq ORIG_RAX(%rsp), %rsi /* get error code into 2nd argument*/ movq $-1, ORIG_RAX(%rsp) /* no syscall to restart */ - call \cfunc /* For some configurations \cfunc ends up being a noreturn. */ ANNOTATE_REACHABLE + call \cfunc 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,ANNOTATE_REACHABLE ); \ +_BUG_FLAGS (ASM_UD2 , __flags,ANNOTATE_REACHABLE (1b )); \instrumentation_end (); \ }while (0 )
arch/x86/include/asm/irq_stack.h +2 -2
@@ -100,8 +100,8 @@ }#define ASM_CALL_ARG0 \ - "call %c[__func] \n" \ - ANNOTATE_REACHABLE + "1: call %c[__func] \n" \ + ANNOTATE_REACHABLE(1b)#define ASM_CALL_ARG1 \ "movq %[arg1], %%rdi \n" \
include/linux/objtool.h +2 -2
@@ -177,11 +177,11 @@*/ #define ANNOTATE_UNRET_BEGIN ASM_ANNOTATE(ANNOTYPE_UNRET_BEGIN)/* -* This should be used directly after an instruction that is considered +* This should be used to refer to an instruction that is considered * terminating, like a noreturn CALL or UD2 when we know they are not -- eg * WARN using UD2. */ -#define ANNOTATE_REACHABLE ASM_ANNOTATE(ANNOTYPE_REACHABLE) +#define ANNOTATE_REACHABLE (label) __ASM_ANNOTATE(label, ANNOTYPE_REACHABLE)#else #define ANNOTATE_NOENDBR ANNOTATE type=ANNOTYPE_NOENDBR
tools/objtool/check.c +0 -23
@@ -614,19 +614,6 @@ static int init_pv_ops(struct objtool_fireturn 0 ; } -static struct instruction *find_last_insn (struct objtool_file *file, -struct section *sec) -{ -struct instruction *insn =NULL ; -unsigned int offset; -unsigned int end = (sec->sh.sh_size >10 ) ? sec->sh.sh_size -10 :0 ; - -for (offset = sec->sh.sh_size -1 ; offset >= end && !insn; offset--) - insn =find_insn (file, sec, offset); - -return insn; -} -static int create_static_call_sections (struct objtool_file *file) {struct static_call_site *site;
@@ -2281,16 +2268,6 @@ static int read_annotate(struct objtool_ offset = reloc->sym->offset +reloc_addend (reloc); insn =find_insn (file, reloc->sym->sec, offset); -/* -* Reachable annotations are 'funneh' and act on the previous instruction :/ -*/ -if (type ==ANNOTYPE_REACHABLE ) { -if (insn) - insn =prev_insn_same_sec (file, insn); -else if (offset == reloc->sym->sec->sh.sh_size) - insn =find_last_insn (file, reloc->sym->sec); - } -if (!insn) {WARN ("bad .discard.annotate_insn entry: %d of type %d" ,reloc_idx (reloc), type);return -1 ;
[tip: objtool/core] objtool: Fix ANNOTATE_REACHABLE to be a normal annotation
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 87116ae6da034242baf06e799f9f0e2a8ee6a796 Gitweb: https://git.kernel.org/tip/87116ae6da034242baf06e799f9f0e2a8ee6a796 Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 28 Nov 2024 10:39:06 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 02 Dec 2024 12:01:44 +01:00
objtool: Fix ANNOTATE_REACHABLE to be a normal annotation
Currently REACHABLE is weird for being on the instruction after the instruction it modifies.
Since all REACHABLE annotations have an explicit instruction, flip them around.
--- arch/loongarch/include/asm/bug.h | 2 +- arch/x86/entry/entry_64.S | 5 ++--- arch/x86/include/asm/bug.h | 2 +- arch/x86/include/asm/irq_stack.h | 4 ++-- include/linux/objtool.h | 4 ++-- tools/objtool/check.c | 23 ----------------------- 6 files changed, 8 insertions(+), 32 deletions(-)
arch/loongarch/include/asm/bug.h +1 -1
@@ -45,7 +45,7 @@#define __WARN_FLAGS (flags) \ do { \ instrumentation_begin(); \ - __BUG_FLAGS(BUGFLAG_WARNING|(flags), ANNOTATE_REACHABLE);\ + __BUG_FLAGS(BUGFLAG_WARNING|(flags), ANNOTATE_REACHABLE(10001b));\ instrumentation_end(); \ } while (0)
arch/x86/entry/entry_64.S +2 -3
@@ -308,10 +308,9 @@ SYM_CODE_END(xen_error_entry) movq $-1, ORIG_RAX(%rsp) /* no syscall to restart */ .endif - call \cfunc - /* For some configurations \cfunc ends up being a noreturn. */ ANNOTATE_REACHABLE + call \cfunc jmp error_return .endm
@@ -529,10 +528,10 @@ SYM_CODE_START(\asmsym) movq %rsp, %rdi /* pt_regs pointer into first argument */ movq ORIG_RAX(%rsp), %rsi /* get error code into 2nd argument*/ movq $-1, ORIG_RAX(%rsp) /* no syscall to restart */ - call \cfunc /* For some configurations \cfunc ends up being a noreturn. */ ANNOTATE_REACHABLE + call \cfunc 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,ANNOTATE_REACHABLE ); \ +_BUG_FLAGS (ASM_UD2 , __flags,ANNOTATE_REACHABLE (1b )); \instrumentation_end (); \ }while (0 )
arch/x86/include/asm/irq_stack.h +2 -2
@@ -100,8 +100,8 @@ }#define ASM_CALL_ARG0 \ - "call %c[__func] \n" \ - ANNOTATE_REACHABLE + "1: call %c[__func] \n" \ + ANNOTATE_REACHABLE(1b)#define ASM_CALL_ARG1 \ "movq %[arg1], %%rdi \n" \
include/linux/objtool.h +2 -2
@@ -177,11 +177,11 @@*/ #define ANNOTATE_UNRET_BEGIN ASM_ANNOTATE(ANNOTYPE_UNRET_BEGIN)/* -* This should be used directly after an instruction that is considered +* This should be used to refer to an instruction that is considered * terminating, like a noreturn CALL or UD2 when we know they are not -- eg * WARN using UD2. */ -#define ANNOTATE_REACHABLE ASM_ANNOTATE(ANNOTYPE_REACHABLE) +#define ANNOTATE_REACHABLE (label) __ASM_ANNOTATE(label, ANNOTYPE_REACHABLE)#else #define ANNOTATE_NOENDBR ANNOTATE type=ANNOTYPE_NOENDBR
tools/objtool/check.c +0 -23
@@ -614,19 +614,6 @@ static int init_pv_ops(struct objtool_file *file)return 0 ; } -static struct instruction *find_last_insn (struct objtool_file *file, -struct section *sec) -{ -struct instruction *insn =NULL ; -unsigned int offset; -unsigned int end = (sec->sh.sh_size >10 ) ? sec->sh.sh_size -10 :0 ; - -for (offset = sec->sh.sh_size -1 ; offset >= end && !insn; offset--) - insn =find_insn (file, sec, offset); - -return insn; -} -static int create_static_call_sections (struct objtool_file *file) {struct static_call_site *site;
@@ -2281,16 +2268,6 @@ static int read_annotate(struct objtool_file *file, offset = reloc->sym->offset +reloc_addend (reloc); insn =find_insn (file, reloc->sym->sec, offset); -/* -* Reachable annotations are 'funneh' and act on the previous instruction :/ -*/ -if (type ==ANNOTYPE_REACHABLE ) { -if (insn) - insn =prev_insn_same_sec (file, insn); -else if (offset == reloc->sym->sec->sh.sh_size) - insn =find_last_insn (file, reloc->sym->sec); - } -if (!insn) {WARN ("bad .discard.annotate_insn entry: %d of type %d" ,reloc_idx (reloc), type);return -1 ;
Peter Zijlstra
maintainerPATCH v2 16/16 objtool: Warn about unknown annotation types
In reply to Peter Zijlstra--- tools/objtool/check.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
tools/objtool/check.c +13 -0
@@ -2335,6 +2335,10 @@ static int __annotate_ifc(struct objtoolstatic int __annotate_late (struct objtool_file *file,int type,struct instruction *insn) {switch (type) { +case ANNOTYPE_NOENDBR : +/* early */ +break ; +case ANNOTYPE_RETPOLINE_SAFE : if (insn->type != INSN_JUMP_DYNAMIC && insn->type != INSN_CALL_DYNAMIC &&
@@ -2359,11 +2363,20 @@ static int __annotate_late(struct objtoo insn->unret =1 ;break ; +case ANNOTYPE_IGNORE_ALTS : +/* early */ +break ; + +case ANNOTYPE_INTRA_FUNCTION_CALL : +/* ifc */ +break ; +case ANNOTYPE_REACHABLE : insn->dead_end = false;break ;default : +WARN_INSN (insn,"Unknown annotation type: %d" , type);break ; }
[tip: objtool/core] objtool: Warn about unknown annotation types
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: e7e0eb53c2f0f68fe2577472ce2802a4efd9d7ce Gitweb: https://git.kernel.org/tip/e7e0eb53c2f0f68fe2577472ce2802a4efd9d7ce Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 28 Nov 2024 10:39:07 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 02 Dec 2024 12:01:45 +01:00
objtool: Warn about unknown annotation types
--- tools/objtool/check.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
tools/objtool/check.c +13 -0
@@ -2335,6 +2335,10 @@ static int __annotate_ifc(struct objtool_file *file, int type, struct instructiostatic int __annotate_late (struct objtool_file *file,int type,struct instruction *insn) {switch (type) { +case ANNOTYPE_NOENDBR : +/* early */ +break ; +case ANNOTYPE_RETPOLINE_SAFE : if (insn->type != INSN_JUMP_DYNAMIC && insn->type != INSN_CALL_DYNAMIC &&
@@ -2359,11 +2363,20 @@ static int __annotate_late(struct objtool_file *file, int type, struct instructi insn->unret =1 ;break ; +case ANNOTYPE_IGNORE_ALTS : +/* early */ +break ; + +case ANNOTYPE_INTRA_FUNCTION_CALL : +/* ifc */ +break ; +case ANNOTYPE_REACHABLE : insn->dead_end = false;break ;default : +WARN_INSN (insn,"Unknown annotation type: %d" , type);break ; }
Quoted 7 lines · Peter Zijlstra
Rewrite/unify the objtool instruction based annotations.
Changes since last time:
- removed unreachable annotation
- included reachable annotation
- various smaller things
Signature · 1 line
Josh