From: David Woodhouse <dwmw2@infradead.org>
To: Linus Torvalds <torvalds@linux-foundation.org>,
Andi Kleen <andi@firstfloor.org>, Borislav Petkov <bp@alien8.de>
Cc: Thomas Gleixner <tglx@linutronix.de>,
the arch/x86 maintainers <x86@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Paul Turner <pjt@google.com>, Andrew Lutomirski <luto@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Tom Lendacky <thomas.lendacky@amd.com>,
Tim Chen <tim.c.chen@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linux-foundation.org>,
Dave Hansen <dave.hansen@intel.com>,
Jiri Kosina <jikos@kernel.org>, Andi Kleen <ak@linux.intel.com>
Subject: Re: [PATCH] x86/retpoline: Fix NOSPEC_JMP for tip
Date: Wed, 10 Jan 2018 10:05:35 +0000 [thread overview]
Message-ID: <1515578735.22302.91.camel@infradead.org> (raw)
In-Reply-To: <1515568506.22302.72.camel@infradead.org>
[-- Attachment #1: Type: text/plain, Size: 1457 bytes --]
On Wed, 2018-01-10 at 07:15 +0000, David Woodhouse wrote:
> I'd really like to know what went wrong though. Did we merge Borislav's
> attempt to peek at jumps inside alternatives, perchance? Will take a
> look...
Ah, it only happens if I run in KVM, not with Qemu's CPU; that's why it
didn't show up in my testing. And it seems to have been introduced by
the addition of '.align 16' at the start of the RETPOLINE_JMP macro. So
this fixes it:
--- a/arch/x86/include/asm/nospec-branch.h
+++ b/arch/x86/include/asm/nospec-branch.h
@@ -15,7 +15,6 @@
* invocation below less ugly.
*/
.macro RETPOLINE_JMP reg:req
- .align 16
call .Ldo_rop_\@
.Lspec_trap_\@:
pause
Borislav? Want to take a look at that please?
I'm going to go ahead and apply Andi's patches anyway. Once I admit
that I shoved the .align in there to precisely match up with Paul's
sequence, and since Linus got me to inline the thing at all the call
sites instead of using the out-of-line thunk, I don't think an
objection of "but it adds some extra bytes for the separate lfence" is
going to work... :)
But actually, I think I may also rip out the .align there. Because
inside alternatives it doesn't make a lot of sense. It may have aligned
the code by padding with NOPs in its *original* location, but once it
gets copied into the place it's executed from, the alignment could be
different.
[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 5213 bytes --]
next prev parent reply other threads:[~2018-01-10 10:05 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-10 0:31 [PATCH] x86/retpoline: Fix NOSPEC_JMP for tip Andi Kleen
2018-01-10 0:39 ` Thomas Gleixner
2018-01-10 0:39 ` Linus Torvalds
2018-01-10 0:40 ` Thomas Gleixner
2018-01-10 0:45 ` Tom Lendacky
2018-01-10 0:50 ` Thomas Gleixner
2018-01-10 1:30 ` Andi Kleen
2018-01-10 1:36 ` Andi Kleen
2018-01-10 1:50 ` Thomas Gleixner
2018-01-10 1:57 ` Andi Kleen
2018-01-10 9:05 ` David Woodhouse
2018-01-10 0:51 ` Andi Kleen
2018-01-10 1:05 ` Thomas Gleixner
2018-01-10 7:15 ` David Woodhouse
2018-01-10 10:05 ` David Woodhouse [this message]
2018-01-10 11:28 ` [PATCH] x86/alternatives: Fix optimize_nops() checking Borislav Petkov
2018-01-10 11:36 ` David Woodhouse
2018-01-10 11:45 ` Borislav Petkov
2018-01-10 11:49 ` David Woodhouse
2018-01-10 11:57 ` Borislav Petkov
2018-01-10 11:58 ` David Woodhouse
2018-01-10 17:33 ` [tip:x86/pti] " tip-bot for Borislav Petkov
2018-01-10 18:12 ` tip-bot for Borislav Petkov
2018-01-10 18:39 ` tip-bot for Borislav Petkov
2018-01-10 19:38 ` [PATCH] " Linus Torvalds
2018-01-10 19:55 ` Thomas Gleixner
2018-01-10 20:15 ` Josh Poimboeuf
2018-01-10 20:19 ` David Woodhouse
2018-01-10 20:26 ` Linus Torvalds
2018-01-10 20:33 ` Peter Zijlstra
2018-01-10 20:36 ` David Woodhouse
2018-01-10 20:49 ` Linus Torvalds
2018-01-10 20:55 ` Borislav Petkov
2018-01-10 21:05 ` Linus Torvalds
2018-01-10 21:08 ` David Woodhouse
2018-01-10 21:11 ` Linus Torvalds
2018-01-10 21:16 ` Josh Poimboeuf
2018-01-10 21:17 ` Linus Torvalds
2018-01-10 21:27 ` Josh Poimboeuf
2018-01-10 21:10 ` Borislav Petkov
2018-01-10 20:55 ` Josh Poimboeuf
2018-01-10 20:05 ` Borislav Petkov
2018-01-10 20:20 ` Linus Torvalds
2018-01-10 20:50 ` Borislav Petkov
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=1515578735.22302.91.camel@infradead.org \
--to=dwmw2@infradead.org \
--cc=ak@linux.intel.com \
--cc=andi@firstfloor.org \
--cc=bp@alien8.de \
--cc=dave.hansen@intel.com \
--cc=gregkh@linux-foundation.org \
--cc=jikos@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=peterz@infradead.org \
--cc=pjt@google.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).