From: "Woodhouse, David" <dwmw@amazon.co.uk>
To: Tom Lendacky <thomas.lendacky@amd.com>, <x86@kernel.org>,
<linux-kernel@vger.kernel.org>,
"Van De Ven, Arjan" <arjan.van.de.ven@intel.com>,
"asit.k.mallick@intel.com" <asit.k.mallick@intel.com>
Cc: Rik van Riel <riel@redhat.com>, Andi Kleen <ak@linux.intel.com>,
"Josh Poimboeuf" <jpoimboe@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Jiri Kosina <jikos@kernel.org>,
Dan Williams <dan.j.williams@intel.com>,
Dave Hansen <dave.hansen@intel.com>,
Borislav Petkov <bp@alien8.de>, Andy Lutomirski <luto@kernel.org>,
Kees Cook <keescook@google.com>,
Thomas Gleixner <tglx@linutronix.de>,
Tim Chen <tim.c.chen@linux.intel.com>,
"Greg Kroah-Hartman" <gregkh@linux-foundation.org>,
Paul Turner <pjt@google.com>
Subject: Re: [PATCH v1] x86/retpoline: Use lfence in the retpoline/RSB filling RSB macros
Date: Sat, 13 Jan 2018 10:46:09 +0000 [thread overview]
Message-ID: <1515840369.22302.523.camel@amazon.co.uk> (raw)
In-Reply-To: <20180113010728.27928.8537.stgit@tlendack-t1.amdoffice.net>
[-- Attachment #1: Type: text/plain, Size: 2702 bytes --]
On Fri, 2018-01-12 at 19:07 -0600, Tom Lendacky wrote:
> The pause instruction is currently used in the retpoline and RSB filling
> macros as a speculation trap. The use of pause was originally suggested
> because it showed a very, very small difference in the amount of
> cycles/time used to execute the retpoline as compared to lfence. On AMD,
> the pause instruction is not a serializing instruction, so the pause/jmp
> loop will use excess power as it is speculated over waiting for return
> to mispredict to the correct target.
>
> The RSB filling macro is applicable to AMD, and, if software is unable to
> verify that lfence is serializing on AMD (possible when running under a
> hypervisor), the generic retpoline support will be used and, so, is also
> applicable to AMD. Change the use of pause to lfence.
>
> Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Conditionally-Acked-by: David Woodhouse <dwmw@amazon.co.uk>
The condition being, as noted, that I'd really like to see it acked by
Arjan/Asit and Paul.
> ---
> arch/x86/include/asm/nospec-branch.h | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h
> index 402a11c..2c4a09a 100644
> --- a/arch/x86/include/asm/nospec-branch.h
> +++ b/arch/x86/include/asm/nospec-branch.h
> @@ -11,7 +11,7 @@
> * Fill the CPU return stack buffer.
> *
> * Each entry in the RSB, if used for a speculative 'ret', contains an
> - * infinite 'pause; jmp' loop to capture speculative execution.
> + * infinite 'lfence; jmp' loop to capture speculative execution.
> *
> * This is required in various cases for retpoline and IBRS-based
> * mitigations for the Spectre variant 2 vulnerability. Sometimes to
> @@ -37,12 +37,12 @@
> 771: \
> call 772f; \
> 773: /* speculation trap */ \
> - pause; \
> + lfence; \
> jmp 773b; \
> 772: \
> call 774f; \
> 775: /* speculation trap */ \
> - pause; \
> + lfence; \
> jmp 775b; \
> 774: \
> dec reg; \
> @@ -72,7 +72,7 @@
> .macro RETPOLINE_JMP reg:req
> call .Ldo_rop_\@
> .Lspec_trap_\@:
> - pause
> + lfence
> jmp .Lspec_trap_\@
> .Ldo_rop_\@:
> mov \reg, (%_ASM_SP)
> @@ -164,7 +164,7 @@
> " jmp 904f;\n" \
> " .align 16\n" \
> "901: call 903f;\n" \
> - "902: pause;\n" \
> + "902: lfence;\n" \
> " jmp 902b;\n" \
> " .align 16\n" \
> "903: addl $4, %%esp;\n" \
>
>
[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 5210 bytes --]
next prev parent reply other threads:[~2018-01-13 10:46 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-13 1:07 [PATCH v1] x86/retpoline: Use lfence in the retpoline/RSB filling RSB macros Tom Lendacky
2018-01-13 1:53 ` Dan Williams
2018-01-13 2:22 ` Tom Lendacky
2018-01-13 10:33 ` [tip:x86/pti] x86/retpoline: Use LFENCE instead of PAUSE " tip-bot for Tom Lendacky
2018-01-13 10:46 ` Woodhouse, David [this message]
2018-01-13 14:07 ` [PATCH v1] x86/retpoline: Use lfence " Van De Ven, Arjan
2018-01-13 21:13 ` Tom Lendacky
2018-01-13 21:36 ` Thomas Gleixner
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=1515840369.22302.523.camel@amazon.co.uk \
--to=dwmw@amazon.co.uk \
--cc=ak@linux.intel.com \
--cc=arjan.van.de.ven@intel.com \
--cc=asit.k.mallick@intel.com \
--cc=bp@alien8.de \
--cc=dan.j.williams@intel.com \
--cc=dave.hansen@intel.com \
--cc=gregkh@linux-foundation.org \
--cc=jikos@kernel.org \
--cc=jpoimboe@redhat.com \
--cc=keescook@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=peterz@infradead.org \
--cc=pjt@google.com \
--cc=riel@redhat.com \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
--cc=tim.c.chen@linux.intel.com \
--cc=torvalds@linux-foundation.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).