From: Peter Zijlstra <peterz@infradead.org>
To: x86@kernel.org, jpoimboe@redhat.com
Cc: linux-kernel@vger.kernel.org, peterz@infradead.org,
elver@google.com, jbaron@akamai.com, rostedt@goodmis.org,
ardb@kernel.org, mark.rutland@arm.com
Subject: [PATCH 1/7] x86/entry: Anchor annotation
Date: Thu, 26 May 2022 12:52:53 +0200 [thread overview]
Message-ID: <20220526105957.754830839@infradead.org> (raw)
In-Reply-To: 20220526105252.440440893@infradead.org
x86_64-allmodconfig gives:
vmlinux.o: warning: objtool: entry_SYSCALL_compat+0x0: ANNOTATE_NOENDBR on ENDBR
This is due to:
ANNOTATE_NOENDBR
SYM_CODE_END(entry_SYSENTER_compat)
SYM_CODE_START(entry_SYSCALL_compat)
UNWIND_HINT_EMPTY
ENDBR
And the hint then landing on the first instruction of the next symbol,
which happens to be ENDBR. Stick in an int3 to anchor the annotation
in the previous symbol.
Fixes: 3e3f06950434 ("x86/ibt: Annotate text references")
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
arch/x86/entry/entry_64_compat.S | 1 +
1 file changed, 1 insertion(+)
--- a/arch/x86/entry/entry_64_compat.S
+++ b/arch/x86/entry/entry_64_compat.S
@@ -124,6 +124,7 @@ SYM_INNER_LABEL(entry_SYSENTER_compat_af
jmp .Lsysenter_flags_fixed
SYM_INNER_LABEL(__end_entry_SYSENTER_compat, SYM_L_GLOBAL)
ANNOTATE_NOENDBR // is_sysenter_singlestep
+ int3
SYM_CODE_END(entry_SYSENTER_compat)
/*
next prev parent reply other threads:[~2022-05-26 11:03 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-26 10:52 [PATCH 0/7] x86: Address various objtool complaints Peter Zijlstra
2022-05-26 10:52 ` Peter Zijlstra [this message]
2022-05-26 15:04 ` [PATCH 1/7] x86/entry: Anchor annotation Josh Poimboeuf
2022-05-26 10:52 ` [PATCH 2/7] objtool: Extend UNWIND_HINT based ENDBR rules Peter Zijlstra
2022-05-26 15:05 ` Josh Poimboeuf
2022-05-28 14:09 ` Peter Zijlstra
2022-05-26 10:52 ` [PATCH 3/7] objtool: Mark __ubsan_handle_builtin_unreachable() as noreturn Peter Zijlstra
2022-05-30 13:17 ` Marco Elver
2022-05-26 10:52 ` [PATCH 4/7] x86/cpu: Elide KCSAN for cpu_has() and friends Peter Zijlstra
2022-05-30 13:14 ` Marco Elver
2022-05-26 10:52 ` [PATCH 5/7] jump_label,noinstr: Avoid instrumentation for JUMP_LABEL=n builds Peter Zijlstra
2022-05-30 13:20 ` Marco Elver
2022-05-26 10:52 ` [PATCH 6/7] x86: Always inline on_thread_stack() and current_top_of_stack() Peter Zijlstra
2022-05-30 10:38 ` [tip: objtool/urgent] " tip-bot2 for Peter Zijlstra
2022-05-30 13:21 ` [PATCH 6/7] " Marco Elver
2022-05-26 10:52 ` [PATCH 7/7] context_tracking: Always inline empty stubs Peter Zijlstra
2022-05-26 15:02 ` Josh Poimboeuf
2022-05-26 15:10 ` Mark Rutland
2022-05-26 15:16 ` Josh Poimboeuf
2022-05-26 15:26 ` Mark Rutland
2022-05-30 10:38 ` [tip: objtool/urgent] " tip-bot2 for 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=20220526105957.754830839@infradead.org \
--to=peterz@infradead.org \
--cc=ardb@kernel.org \
--cc=elver@google.com \
--cc=jbaron@akamai.com \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=rostedt@goodmis.org \
--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;
as well as URLs for NNTP newsgroup(s).