Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-29 17:22:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

objtool: Convert ANNOTATE_NOENDBR to ANNOTATE

Browse Source 
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Josh Poimboeuf <jpoimboe@kernel.org>
Link: https://lore.kernel.org/r/20241128094311.042140333@infradead.org
This commit is contained in:
Peter Zijlstra 2024-11-28 10:38:53 +01:00
parent 2116b349e2
commit 22c3d58079
4 changed files with 19 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/linux/objtool.h
View File

@ -45,12 +45,6 @@
#define STACK_FRAME_NON_STANDARD_FP(func) #define STACK_FRAME_NON_STANDARD_FP(func)
#endif #endif
#define ANNOTATE_NOENDBR \
"986: \n\t" \
".pushsection .discard.noendbr\n\t" \
".long 986b\n\t" \
".popsection\n\t"
#define ASM_REACHABLE \ #define ASM_REACHABLE \
"998:\n\t" \ "998:\n\t" \
".pushsection .discard.reachable\n\t" \ ".pushsection .discard.reachable\n\t" \
@ -64,6 +58,8 @@
".long " __stringify(type) "\n\t" \ ".long " __stringify(type) "\n\t" \
".popsection\n\t" ".popsection\n\t"
#define ANNOTATE_NOENDBR ASM_ANNOTATE(ANNOTYPE_NOENDBR)
#else /* __ASSEMBLY__ */ #else /* __ASSEMBLY__ */
/* /*
@ -122,13 +118,6 @@
#endif #endif
.endm .endm
.macro ANNOTATE_NOENDBR
.Lhere_\@:
.pushsection .discard.noendbr
.long .Lhere_\@
.popsection
.endm
/* /*
* Use objtool to validate the entry requirement that all code paths do * Use objtool to validate the entry requirement that all code paths do
* VALIDATE_UNRET_END before RET. * VALIDATE_UNRET_END before RET.
@ -161,6 +150,8 @@
.popsection .popsection
.endm .endm
#define ANNOTATE_NOENDBR ANNOTATE type=ANNOTYPE_NOENDBR
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#else /* !CONFIG_OBJTOOL */ #else /* !CONFIG_OBJTOOL */

5
include/linux/objtool_types.h
View File

@ -54,4 +54,9 @@ struct unwind_hint {
#define UNWIND_HINT_TYPE_SAVE 6 #define UNWIND_HINT_TYPE_SAVE 6
#define UNWIND_HINT_TYPE_RESTORE 7 #define UNWIND_HINT_TYPE_RESTORE 7
/*
* Annotate types
*/
#define ANNOTYPE_NOENDBR 1
#endif /* _LINUX_OBJTOOL_TYPES_H */ #endif /* _LINUX_OBJTOOL_TYPES_H */

5
tools/include/linux/objtool_types.h
View File

@ -54,4 +54,9 @@ struct unwind_hint {
#define UNWIND_HINT_TYPE_SAVE 6 #define UNWIND_HINT_TYPE_SAVE 6
#define UNWIND_HINT_TYPE_RESTORE 7 #define UNWIND_HINT_TYPE_RESTORE 7
/*
* Annotate types
*/
#define ANNOTYPE_NOENDBR 1
#endif /* _LINUX_OBJTOOL_TYPES_H */ #endif /* _LINUX_OBJTOOL_TYPES_H */

32
tools/objtool/check.c
View File

@ -2412,32 +2412,12 @@ static int read_annotate(struct objtool_file *file, void (*func)(int type, struc
return 0; return 0;
} }
static void __annotate_nop(int type, struct instruction *insn) static void __annotate_noendbr(int type, struct instruction *insn)
{ {
} if (type != ANNOTYPE_NOENDBR)
return;
static int read_noendbr_hints(struct objtool_file *file) insn->noendbr = 1;
{
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;
}
return 0;
} }
static int read_retpoline_hints(struct objtool_file *file) static int read_retpoline_hints(struct objtool_file *file)
@ -2713,12 +2693,10 @@ static int decode_sections(struct objtool_file *file)
if (ret) if (ret)
return ret; return ret;
read_annotate(file, __annotate_nop);
/* /*
* Must be before read_unwind_hints() since that needs insn->noendbr. * Must be before read_unwind_hints() since that needs insn->noendbr.
*/ */
ret = read_noendbr_hints(file); ret = read_annotate(file, __annotate_noendbr);
if (ret) if (ret)
return ret; return ret;