From: Sean Christopherson <seanjc@google.com>
To: Peter Zijlstra <peterz@infradead.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
linux-kernel@vger.kernel.org, x86@kernel.org,
kvm@vger.kernel.org
Subject: Re: [PATCH 03/11] objtool: Convert ANNOTATE_RETPOLINE_SAFE to ANNOTATE
Date: Wed, 6 Dec 2023 15:31:58 -0800 [thread overview]
Message-ID: <ZXEEbrI7K6XGr2dN@google.com> (raw)
In-Reply-To: <20231204093731.574465649@infradead.org>
On Mon, Dec 04, 2023, Peter Zijlstra wrote:
>
> --- a/arch/x86/include/asm/nospec-branch.h
> +++ b/arch/x86/include/asm/nospec-branch.h
> @@ -193,12 +193,7 @@
> * objtool the subsequent indirect jump/call is vouched safe for retpoline
> * builds.
> */
> -.macro ANNOTATE_RETPOLINE_SAFE
> -.Lhere_\@:
> - .pushsection .discard.retpoline_safe
> - .long .Lhere_\@
> - .popsection
> -.endm
> +#define ANNOTATE_RETPOLINE_SAFE ANNOTATE type=ANNOTYPE_RETPOLINE_SAFE
>
> /*
> * (ab)use RETPOLINE_SAFE on RET to annotate away 'bare' RET instructions
> @@ -317,11 +312,7 @@
>
> #else /* __ASSEMBLY__ */
>
> -#define ANNOTATE_RETPOLINE_SAFE \
> - "999:\n\t" \
> - ".pushsection .discard.retpoline_safe\n\t" \
> - ".long 999b\n\t" \
> - ".popsection\n\t"
> +#define ANNOTATE_RETPOLINE_SAFE ASM_ANNOTATE(ANNOTYPE_RETPOLINE_SAFE)
This fails for some of my builds that end up with CONFIG_OBJTOOl=n. Adding a
stub for ASM_ANNOTATE() gets me past that:
@@ -156,6 +171,7 @@
#define STACK_FRAME_NON_STANDARD(func)
#define STACK_FRAME_NON_STANDARD_FP(func)
#define ANNOTATE_NOENDBR
+#define ASM_ANNOTATE(x)
#define ASM_REACHABLE
#else
#define ANNOTATE_INTRA_FUNCTION_CALL
but then I run into other issues:
arch/x86/kernel/relocate_kernel_32.S: Assembler messages:
arch/x86/kernel/relocate_kernel_32.S:96: Error: Parameter named `type' does not exist for macro `annotate'
arch/x86/kernel/relocate_kernel_32.S:166: Error: Parameter named `type' does not exist for macro `annotate'
arch/x86/kernel/relocate_kernel_32.S:174: Error: Parameter named `type' does not exist for macro `annotate'
arch/x86/kernel/relocate_kernel_32.S:200: Error: Parameter named `type' does not exist for macro `annotate'
arch/x86/kernel/relocate_kernel_32.S:220: Error: Parameter named `type' does not exist for macro `annotate'
arch/x86/kernel/relocate_kernel_32.S:285: Error: Parameter named `type' does not exist for macro `annotate'
next prev parent reply other threads:[~2023-12-06 23:32 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 [this message]
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=ZXEEbrI7K6XGr2dN@google.com \
--to=seanjc@google.com \
--cc=jpoimboe@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--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