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 VALIDATE_UNRET_BEGIN 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.358508242@infradead.org
This commit is contained in:
Peter Zijlstra 2024-11-28 10:38:56 +01:00
parent 317f2a6461
commit 18aa6118a1
4 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/linux/objtool.h
View File

@ -130,15 +130,12 @@
* NOTE: The macro must be used at the beginning of a global symbol, otherwise * NOTE: The macro must be used at the beginning of a global symbol, otherwise
* it will be ignored. * it will be ignored.
*/ */
.macro VALIDATE_UNRET_BEGIN
#if defined(CONFIG_NOINSTR_VALIDATION) && \ #if defined(CONFIG_NOINSTR_VALIDATION) && \
(defined(CONFIG_MITIGATION_UNRET_ENTRY) || defined(CONFIG_MITIGATION_SRSO)) (defined(CONFIG_MITIGATION_UNRET_ENTRY) || defined(CONFIG_MITIGATION_SRSO))
.Lhere_\@: #define VALIDATE_UNRET_BEGIN ANNOTATE type=ANNOTYPE_UNRET_BEGIN
.pushsection .discard.validate_unret #else
.long .Lhere_\@ - . #define VALIDATE_UNRET_BEGIN
.popsection
#endif #endif
.endm
.macro REACHABLE .macro REACHABLE
.Lhere_\@: .Lhere_\@:

1
include/linux/objtool_types.h
View File

@ -61,5 +61,6 @@ struct unwind_hint {
#define ANNOTYPE_RETPOLINE_SAFE 2 #define ANNOTYPE_RETPOLINE_SAFE 2
#define ANNOTYPE_INSTR_BEGIN 3 #define ANNOTYPE_INSTR_BEGIN 3
#define ANNOTYPE_INSTR_END 4 #define ANNOTYPE_INSTR_END 4
#define ANNOTYPE_UNRET_BEGIN 5
#endif /* _LINUX_OBJTOOL_TYPES_H */ #endif /* _LINUX_OBJTOOL_TYPES_H */

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

@ -61,5 +61,6 @@ struct unwind_hint {
#define ANNOTYPE_RETPOLINE_SAFE 2 #define ANNOTYPE_RETPOLINE_SAFE 2
#define ANNOTYPE_INSTR_BEGIN 3 #define ANNOTYPE_INSTR_BEGIN 3
#define ANNOTYPE_INSTR_END 4 #define ANNOTYPE_INSTR_END 4
#define ANNOTYPE_UNRET_BEGIN 5
#endif /* _LINUX_OBJTOOL_TYPES_H */ #endif /* _LINUX_OBJTOOL_TYPES_H */

28
tools/objtool/check.c
View File

@ -2458,33 +2458,15 @@ static int __annotate_instr(int type, struct instruction *insn)
return 0; return 0;
} }
static int read_validate_unret_hints(struct objtool_file *file) static int __annotate_unret(int type, struct instruction *insn)
{ {
struct section *rsec; if (type != ANNOTYPE_UNRET_BEGIN)
struct instruction *insn;
struct reloc *reloc;
rsec = find_section_by_name(file->elf, ".rela.discard.validate_unret");
if (!rsec)
return 0; return 0;
for_each_reloc(rsec, reloc) { insn->unret = 1;
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;
}
return 0; return 0;
}
}
static int read_intra_function_calls(struct objtool_file *file) static int read_intra_function_calls(struct objtool_file *file)
{ {
@ -2705,7 +2687,7 @@ static int decode_sections(struct objtool_file *file)
if (ret) if (ret)
return ret; return ret;
ret = read_validate_unret_hints(file); ret = read_annotate(file, __annotate_unret);
if (ret) if (ret)
return ret; return ret;