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 <peterz@xxxxxxxxxxxxx> AuthorDate: Thu, 28 Nov 2024 10:39:07 +01:00 Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx> CommitterDate: Mon, 02 Dec 2024 12:01:45 +01:00 objtool: Warn about unknown annotation types Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Acked-by: Josh Poimboeuf <jpoimboe@xxxxxxxxxx> Link: https://lore.kernel.org/r/20241128094312.611961175@xxxxxxxxxxxxx --- tools/objtool/check.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 26bdd3e..bfb407f 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -2335,6 +2335,10 @@ static int __annotate_ifc(struct objtool_file *file, int type, struct instructio static 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; }
![]() |