From: Peter Zijlstra <peterz@infradead.org>
To: jpoimboe@redhat.com, alexandre.chartre@oracle.com
Cc: linux-kernel@vger.kernel.org, jthierry@redhat.com,
tglx@linutronix.de, x86@kernel.org
Subject: Re: [RFC][PATCH 6/7] x86/retpoline: Out-of-line retpoline
Date: Thu, 16 Apr 2020 17:22:42 +0200 [thread overview]
Message-ID: <20200416152242.GQ20730@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <20200416151025.064291444@infradead.org>
Bah, chunks went missing, I'll make sure to push out a working version.
On Thu, Apr 16, 2020 at 05:07:58PM +0200, Peter Zijlstra wrote:
> --- a/arch/x86/lib/retpoline.S
> +++ b/arch/x86/lib/retpoline.S
> @@ -7,15 +7,30 @@
> #include <asm/alternative-asm.h>
> #include <asm/export.h>
> #include <asm/nospec-branch.h>
> +#include <asm/unwind_hints.h>
> +#include <asm/frame.h>
>
> .macro THUNK reg
> .section .text.__x86.indirect_thunk
>
> + .align 32
> SYM_FUNC_START(__x86_indirect_thunk_\reg)
> - CFI_STARTPROC
> - JMP_NOSPEC %\reg
> - CFI_ENDPROC
> + JMP_NOSPEC \reg
> SYM_FUNC_END(__x86_indirect_thunk_\reg)
> +
> +SYM_FUNC_START_NOALIGN(__x86_retpoline_\reg)
> + ANNOTATE_INTRA_FUNCTION_CALL
> + call .Ldo_rop_\@
> +.Lspec_trap_\@:
UNWIND_HINT_EMPTY
> + pause
> + lfence
> + jmp .Lspec_trap_\@
> +.Ldo_rop_\@:
> + mov %\reg, (%_ASM_SP)
> + UNWIND_HINT_RET_OFFSET
> + ret
> +SYM_FUNC_END(__x86_retpoline_\reg)
> +
> .endm
>
> /*
next prev parent reply other threads:[~2020-04-16 15:23 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-16 15:07 [RFC][PATCH 0/7] objtool vs retpoline Peter Zijlstra
2020-04-16 15:07 ` [RFC][PATCH 1/7] objtool: is_fentry_call() crashes if call has no destination Peter Zijlstra
2020-04-16 15:07 ` [RFC][PATCH 2/7] objtool: UNWIND_HINT_RET_OFFSET should not check registers Peter Zijlstra
2020-04-16 15:07 ` [RFC][PATCH 3/7] objtool: Allow branches within the same alternative Peter Zijlstra
2020-04-19 16:32 ` Josh Poimboeuf
2020-04-19 19:27 ` Peter Zijlstra
2020-04-16 15:07 ` [RFC][PATCH 4/7] objtool: Add support for intra-function calls Peter Zijlstra
2020-04-19 16:41 ` Josh Poimboeuf
2020-04-23 11:40 ` Peter Zijlstra
2020-04-16 15:07 ` [RFC][PATCH 5/7] x86/speculation: Change __FILL_RETURN_BUFFER to work with objtool Peter Zijlstra
2020-04-19 16:51 ` Josh Poimboeuf
2020-04-19 16:55 ` Josh Poimboeuf
2020-04-19 18:58 ` Peter Zijlstra
2020-04-16 15:07 ` [RFC][PATCH 6/7] x86/retpoline: Out-of-line retpoline Peter Zijlstra
2020-04-16 15:22 ` Peter Zijlstra [this message]
2020-04-16 15:07 ` [RFC][PATCH 7/7] x86/nospec: Remove ANNOTATE_NOSPEC_ALTERNATIVE Peter Zijlstra
2020-04-16 15:32 ` [RFC][PATCH 0/7] objtool vs retpoline 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=20200416152242.GQ20730@hirez.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=alexandre.chartre@oracle.com \
--cc=jpoimboe@redhat.com \
--cc=jthierry@redhat.com \
--cc=linux-kernel@vger.kernel.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
Powered by JetHome