From: Peter Zijlstra <peterz@infradead.org>
To: Sean Christopherson <seanjc@google.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org, peterz@infradead.org,
x86@kernel.org, kvm@vger.kernel.org
Subject: [PATCH 08/11] objtool: Collapse annotate sequences
Date: Mon, 04 Dec 2023 10:37:10 +0100 [thread overview]
Message-ID: <20231204093732.204792131@infradead.org> (raw)
In-Reply-To: 20231204093702.989848513@infradead.org
Reduce read_annotate() runs by collapsing subsequent runs into a
single call.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
tools/objtool/check.c | 87 ++++++++++++++++++--------------------------------
1 file changed, 32 insertions(+), 55 deletions(-)
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -2308,21 +2308,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;
}
@@ -2356,26 +2359,21 @@ static int __annotate_ifc(struct objtool
return 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;
@@ -2384,6 +2382,10 @@ static int __annotate_instr(struct objto
insn->instr--;
break;
+ case ANNOTYPE_UNRET_BEGIN:
+ insn->unret = 1;
+ break;
+
default:
break;
}
@@ -2391,16 +2393,6 @@ static int __annotate_instr(struct objto
return 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.
@@ -2507,14 +2499,7 @@ static int decode_sections(struct objtoo
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;
@@ -2560,15 +2545,7 @@ static int decode_sections(struct objtoo
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;
next prev parent reply other threads:[~2023-12-04 9:39 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-04 9:37 [PATCH 00/11] x86/kvm/emulate: Avoid RET for FASTOPs Peter Zijlstra
2023-12-04 9:37 ` [PATCH 01/11] objtool: Generic annotation infrastructure Peter Zijlstra
2024-11-08 14:16 ` Peter Zijlstra
2024-11-08 14:57 ` Nathan Chancellor
2024-11-08 15:13 ` Peter Zijlstra
2024-11-08 19:03 ` Peter Zijlstra
2023-12-04 9:37 ` [PATCH 02/11] objtool: Convert ANNOTATE_NOENDBR to ANNOTATE Peter Zijlstra
2023-12-04 9:37 ` [PATCH 03/11] objtool: Convert ANNOTATE_RETPOLINE_SAFE " Peter Zijlstra
2023-12-06 23:31 ` Sean Christopherson
2024-09-13 20:47 ` James Houghton
2024-10-30 20:08 ` James Houghton
2024-11-06 17:42 ` Peter Zijlstra
2023-12-04 9:37 ` [PATCH 04/11] objtool: Convert instrumentation_{begin,end}() " Peter Zijlstra
2023-12-04 9:37 ` [PATCH 05/11] objtool: Convert VALIDATE_UNRET_BEGIN " Peter Zijlstra
2023-12-04 9:37 ` [PATCH 06/11] objtool: Convert ANNOTATE_IGNORE_ALTERNATIVE " Peter Zijlstra
2023-12-04 9:37 ` [PATCH 07/11] objtool: Convert ANNOTATE_INTRA_FUNCTION_CALLS " Peter Zijlstra
2023-12-04 9:37 ` Peter Zijlstra [this message]
2023-12-04 9:37 ` [PATCH 09/11] x86/kvm/emulate: Implement test_cc() in C Peter Zijlstra
2023-12-04 9:37 ` [PATCH 10/11] x86/nospec: JMP_NOSPEC Peter Zijlstra
2023-12-04 9:37 ` [PATCH 11/11] x86/kvm/emulate: Avoid RET for fastops Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231204093732.204792131@infradead.org \
--to=peterz@infradead.org \
--cc=jpoimboe@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox