From nobody Mon Feb 9 01:18:17 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7AC96C4167B for ; Mon, 4 Dec 2023 09:40:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235398AbjLDJka (ORCPT ); Mon, 4 Dec 2023 04:40:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235293AbjLDJkB (ORCPT ); Mon, 4 Dec 2023 04:40:01 -0500 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB1F1119; Mon, 4 Dec 2023 01:39:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:MIME-Version:References: Subject:Cc:To:From:Date:Message-Id:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:In-Reply-To; bh=Jgweoy9v1ry+vJ+0xQvkdC/DCJR/HfQjV7GgwvonHBA=; b=TsMsM4RqmJ30Dxhaj7X6J4Zvnb S1vBqgDpLm/YetggJX/GKdtsZdMYIARCMQTuL89qct50tzNboez/lYKD5uO3NX2mOvnewAo+12F+P tZpcUqtnC7SQLklE7qJe72Y8wk4/wE6R/PWxK4aqk2QFRyxHDiqe4E773IZn/gqrE8ORLRFNzEPj6 LkyyKx7xzYzviXyYUkY6Xqo7NKc5tMTdkXO77Kgg2wlwR7I1pCrTfGT4ipektuCH7g26epOtf7N3y nNMKzkx8qfvtDKIsTMjFgAz4cUYY0bLyefv++/U3k+9SjN3c/ua7Nrll5njDV0bXDXarSA0nB3JGR R0S+ckng==; Received: from j130084.upc-j.chello.nl ([24.132.130.84] helo=noisy.programming.kicks-ass.net) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1rA5QZ-000X0Z-5i; Mon, 04 Dec 2023 09:39:47 +0000 Received: by noisy.programming.kicks-ass.net (Postfix, from userid 0) id A486B300AA5; Mon, 4 Dec 2023 10:39:45 +0100 (CET) Message-Id: <20231204093732.097671022@infradead.org> User-Agent: quilt/0.65 Date: Mon, 04 Dec 2023 10:37:09 +0100 From: Peter Zijlstra To: Sean Christopherson , Paolo Bonzini , Josh Poimboeuf , Thomas Gleixner Cc: linux-kernel@vger.kernel.org, peterz@infradead.org, x86@kernel.org, kvm@vger.kernel.org Subject: [PATCH 07/11] objtool: Convert ANNOTATE_INTRA_FUNCTION_CALLS to ANNOTATE References: <20231204093702.989848513@infradead.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Zijlstra (Intel) --- include/linux/objtool.h | 16 ++---- include/linux/objtool_types.h | 1=20 tools/include/linux/objtool_types.h | 1=20 tools/objtool/check.c | 96 ++++++++++++++-----------------= ----- 4 files changed, 47 insertions(+), 67 deletions(-) --- a/include/linux/objtool.h +++ b/include/linux/objtool.h @@ -66,16 +66,6 @@ #else /* __ASSEMBLY__ */ =20 /* - * This macro indicates that the following intra-function call is valid. - * Any non-annotated intra-function call will cause objtool to issue a war= ning. - */ -#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 a= nd * the rest. The normal callable functions can be called by other code, a= nd * don't do anything unusual with the stack. Such normal callable functio= ns @@ -152,6 +142,12 @@ =20 #define ANNOTATE_NOENDBR ANNOTATE type=3DANNOTYPE_NOENDBR =20 +/* + * This macro indicates that the following intra-function call is valid. + * Any non-annotated intra-function call will cause objtool to issue a war= ning. + */ +#define ANNOTATE_INTRA_FUNCTION_CALL ANNOTATE type=3DANNOTYPE_INTRA_FUNCTI= ON_CALLS + #endif /* __ASSEMBLY__ */ =20 #else /* !CONFIG_OBJTOOL */ --- a/include/linux/objtool_types.h +++ b/include/linux/objtool_types.h @@ -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_CALLS 7 =20 #endif /* _LINUX_OBJTOOL_TYPES_H */ --- a/tools/include/linux/objtool_types.h +++ b/tools/include/linux/objtool_types.h @@ -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_CALLS 7 =20 #endif /* _LINUX_OBJTOOL_TYPES_H */ --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -2274,7 +2274,8 @@ static int read_unwind_hints(struct objt return 0; } =20 -static int read_annotate(struct objtool_file *file, int (*func)(int type, = struct instruction *insn)) +static int read_annotate(struct objtool_file *file, + int (*func)(struct objtool_file *file, int type, struct instruction *i= nsn)) { struct section *rsec, *sec; struct instruction *insn; @@ -2299,7 +2300,7 @@ static int read_annotate(struct objtool_ =20 type =3D *(u32 *)(sec->data->d_buf + (reloc_idx(reloc) * sec->sh.sh_ents= ize) + 4); =20 - ret =3D func(type, insn); + ret =3D func(file, type, insn); if (ret < 0) return ret; } @@ -2307,7 +2308,7 @@ static int read_annotate(struct objtool_ return 0; } =20 -static int __annotate_ignore_alts(int type, struct instruction *insn) +static int __annotate_ignore_alts(struct objtool_file *file, int type, str= uct instruction *insn) { if (type !=3D ANNOTYPE_IGNORE_ALTS) return 0; @@ -2316,7 +2317,7 @@ static int __annotate_ignore_alts(int ty return 0; } =20 -static int __annotate_noendbr(int type, struct instruction *insn) +static int __annotate_noendbr(struct objtool_file *file, int type, struct = instruction *insn) { if (type !=3D ANNOTYPE_NOENDBR) return 0; @@ -2325,7 +2326,37 @@ static int __annotate_noendbr(int type, return 0; } =20 -static int __annotate_retpoline_safe(int type, struct instruction *insn) +static int __annotate_ifc(struct objtool_file *file, int type, struct inst= ruction *insn) +{ + unsigned long dest_off; + + if (type !=3D ANNOTYPE_INTRA_FUNCTION_CALLS) + return 0; + + if (insn->type !=3D INSN_CALL) { + WARN_INSN(insn, "intra_function_call not a direct call"); + return -1; + } + + /* + * Treat intra-function CALLs as JMPs, but with a stack_op. + * See add_call_destinations(), which strips stack_ops from + * normal CALLs. + */ + insn->type =3D INSN_JUMP_UNCONDITIONAL; + + dest_off =3D arch_jump_destination(insn); + insn->jump_dest =3D find_insn(file, insn->sec, dest_off); + if (!insn->jump_dest) { + WARN_INSN(insn, "can't find call dest at %s+0x%lx", + insn->sec->name, dest_off); + return -1; + } + + return 0; +} + +static int __annotate_retpoline_safe(struct objtool_file *file, int type, = struct instruction *insn) { if (type !=3D ANNOTYPE_RETPOLINE_SAFE) return 0; @@ -2342,7 +2373,7 @@ static int __annotate_retpoline_safe(int return 0; } =20 -static int __annotate_instr(int type, struct instruction *insn) +static int __annotate_instr(struct objtool_file *file, int type, struct in= struction *insn) { switch (type) { case ANNOTYPE_INSTR_BEGIN: @@ -2360,7 +2391,7 @@ static int __annotate_instr(int type, st return 0; } =20 -static int __annotate_unret(int type, struct instruction *insn) +static int __annotate_unret(struct objtool_file *file, int type, struct in= struction *insn) { if (type !=3D ANNOTYPE_UNRET_BEGIN) return 0; @@ -2370,55 +2401,6 @@ static int __annotate_unret(int type, st =20 } =20 -static int read_intra_function_calls(struct objtool_file *file) -{ - struct instruction *insn; - struct section *rsec; - struct reloc *reloc; - - rsec =3D find_section_by_name(file->elf, ".rela.discard.intra_function_ca= lls"); - if (!rsec) - return 0; - - for_each_reloc(rsec, reloc) { - unsigned long dest_off; - - if (reloc->sym->type !=3D STT_SECTION) { - WARN("unexpected relocation symbol type in %s", - rsec->name); - return -1; - } - - insn =3D find_insn(file, reloc->sym->sec, reloc_addend(reloc)); - if (!insn) { - WARN("bad .discard.intra_function_call entry"); - return -1; - } - - if (insn->type !=3D INSN_CALL) { - WARN_INSN(insn, "intra_function_call not a direct call"); - return -1; - } - - /* - * Treat intra-function CALLs as JMPs, but with a stack_op. - * See add_call_destinations(), which strips stack_ops from - * normal CALLs. - */ - insn->type =3D INSN_JUMP_UNCONDITIONAL; - - dest_off =3D arch_jump_destination(insn); - insn->jump_dest =3D find_insn(file, insn->sec, dest_off); - if (!insn->jump_dest) { - WARN_INSN(insn, "can't find call dest at %s+0x%lx", - insn->sec->name, dest_off); - return -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 d= o so. @@ -2554,7 +2536,7 @@ static int decode_sections(struct objtoo * Must be before add_call_destination(); it changes INSN_CALL to * INSN_JUMP. */ - ret =3D read_intra_function_calls(file); + ret =3D read_annotate(file, __annotate_ifc); if (ret) return ret;