From: Andi Kleen <andi@firstfloor.org>
To: tglx@linutronix.de
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
torvalds@linux-foundation.org, dwmw@amazon.co.uk, pjt@google.com,
luto@kernel.org, peterz@infradead.org, thomas.lendacky@amd.com,
tim.c.chen@linux.intel.com, gregkh@linux-foundation.org,
dave.hansen@intel.com, jikos@kernel.org,
Andi Kleen <ak@linux.intel.com>
Subject: [PATCH] x86/retpoline: Fix NOSPEC_JMP for tip
Date: Tue, 9 Jan 2018 16:31:39 -0800 [thread overview]
Message-ID: <20180110003139.10531-1-andi@firstfloor.org> (raw)
From: Andi Kleen <ak@linux.intel.com>
With the latest tip x86/pti I get oopses when booting
a 64bit VM in qemu with RETPOLINE/gcc7 and PTI enabled.
The following patch fixes it for me. Something doesn't
seem to work with ALTERNATIVE_2. It adds only a few bytes
more code, so seems acceptable.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
arch/x86/include/asm/nospec-branch.h | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h
index 8ddf8513550e..eea6340a0abb 100644
--- a/arch/x86/include/asm/nospec-branch.h
+++ b/arch/x86/include/asm/nospec-branch.h
@@ -46,9 +46,8 @@
*/
.macro JMP_NOSPEC reg:req
#ifdef CONFIG_RETPOLINE
- ALTERNATIVE_2 __stringify(jmp *\reg), \
- __stringify(RETPOLINE_JMP \reg), X86_FEATURE_RETPOLINE, \
- __stringify(lfence; jmp *\reg), X86_FEATURE_RETPOLINE_AMD
+ ALTERNATIVE "", __stringify(lfence; jmp *\reg), X86_FEATURE_RETPOLINE_AMD
+ ALTERNATIVE __stringify(jmp *\reg), __stringify(RETPOLINE_JMP \reg), X86_FEATURE_RETPOLINE
#else
jmp *\reg
#endif
--
2.14.3
next reply other threads:[~2018-01-10 0:31 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-10 0:31 Andi Kleen [this message]
2018-01-10 0:39 ` [PATCH] x86/retpoline: Fix NOSPEC_JMP for tip 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
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=20180110003139.10531-1-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=ak@linux.intel.com \
--cc=dave.hansen@intel.com \
--cc=dwmw@amazon.co.uk \
--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