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 02/11] objtool: Convert ANNOTATE_NOENDBR to ANNOTATE
Date: Mon, 04 Dec 2023 10:37:04 +0100 [thread overview]
Message-ID: <20231204093731.465944066@infradead.org> (raw)
In-Reply-To: 20231204093702.989848513@infradead.org
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
include/linux/objtool.h | 17 ++++-------------
include/linux/objtool_types.h | 5 +++++
tools/include/linux/objtool_types.h | 5 +++++
tools/objtool/check.c | 32 +++++---------------------------
4 files changed, 19 insertions(+), 40 deletions(-)
--- a/include/linux/objtool.h
+++ b/include/linux/objtool.h
@@ -45,12 +45,6 @@
#define STACK_FRAME_NON_STANDARD_FP(func)
#endif
-#define ANNOTATE_NOENDBR \
- "986: \n\t" \
- ".pushsection .discard.noendbr\n\t" \
- ".long 986b\n\t" \
- ".popsection\n\t"
-
#define ASM_REACHABLE \
"998:\n\t" \
".pushsection .discard.reachable\n\t" \
@@ -64,6 +58,8 @@
".long " __stringify(x) "\n\t" \
".popsection\n\t"
+#define ANNOTATE_NOENDBR ASM_ANNOTATE(ANNOTYPE_NOENDBR)
+
#else /* __ASSEMBLY__ */
/*
@@ -122,13 +118,6 @@
#endif
.endm
-.macro ANNOTATE_NOENDBR
-.Lhere_\@:
- .pushsection .discard.noendbr
- .long .Lhere_\@
- .popsection
-.endm
-
/*
* Use objtool to validate the entry requirement that all code paths do
* VALIDATE_UNRET_END before RET.
@@ -161,6 +150,8 @@
.popsection
.endm
+#define ANNOTATE_NOENDBR ANNOTATE type=ANNOTYPE_NOENDBR
+
#endif /* __ASSEMBLY__ */
#else /* !CONFIG_OBJTOOL */
--- a/include/linux/objtool_types.h
+++ b/include/linux/objtool_types.h
@@ -54,4 +54,9 @@ struct unwind_hint {
#define UNWIND_HINT_TYPE_SAVE 6
#define UNWIND_HINT_TYPE_RESTORE 7
+/*
+ * Annotate types
+ */
+#define ANNOTYPE_NOENDBR 1
+
#endif /* _LINUX_OBJTOOL_TYPES_H */
--- a/tools/include/linux/objtool_types.h
+++ b/tools/include/linux/objtool_types.h
@@ -54,4 +54,9 @@ struct unwind_hint {
#define UNWIND_HINT_TYPE_SAVE 6
#define UNWIND_HINT_TYPE_RESTORE 7
+/*
+ * Annotate types
+ */
+#define ANNOTYPE_NOENDBR 1
+
#endif /* _LINUX_OBJTOOL_TYPES_H */
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -2339,32 +2339,12 @@ static int read_annotate(struct objtool_
return 0;
}
-static void __annotate_nop(int type, struct instruction *insn)
+static void __annotate_noendbr(int type, struct instruction *insn)
{
-}
-
-static int read_noendbr_hints(struct objtool_file *file)
-{
- struct instruction *insn;
- struct section *rsec;
- struct reloc *reloc;
-
- rsec = find_section_by_name(file->elf, ".rela.discard.noendbr");
- if (!rsec)
- return 0;
+ if (type != ANNOTYPE_NOENDBR)
+ return;
- 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;
+ insn->noendbr = 1;
}
static int read_retpoline_hints(struct objtool_file *file)
@@ -2637,12 +2617,10 @@ static int decode_sections(struct objtoo
if (ret)
return ret;
- ret = read_annotate(file, __annotate_nop);
-
/*
* Must be before read_unwind_hints() since that needs insn->noendbr.
*/
- ret = read_noendbr_hints(file);
+ ret = read_annotate(file, __annotate_noendbr);
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 ` Peter Zijlstra [this message]
2023-12-04 9:37 ` [PATCH 03/11] objtool: Convert ANNOTATE_RETPOLINE_SAFE to ANNOTATE 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 ` [PATCH 08/11] objtool: Collapse annotate sequences Peter Zijlstra
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=20231204093731.465944066@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