From: tip-bot for David Woodhouse <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: tglx@linutronix.de, tim.c.chen@linux.intel.com, pjt@google.com,
arjan@linux.intel.com, luto@amacapital.net, hpa@zytor.com,
riel@redhat.com, dave.hansen@intel.com,
gregkh@linux-foundation.org, torvalds@linux-foundation.org,
linux-kernel@vger.kernel.org, mingo@kernel.org,
keescook@google.com, peterz@infradead.org, dwmw@amazon.co.uk,
jikos@kernel.org, ak@linux.intel.com
Subject: [tip:x86/pti] x86/retpoline/hyperv: Convert assembler indirect jumps
Date: Wed, 10 Jan 2018 10:42:40 -0800 [thread overview]
Message-ID: <tip-f14fd95d2f3e611619756ea3c008aee3b4bd4978@git.kernel.org> (raw)
In-Reply-To: <1515508997-6154-8-git-send-email-dwmw@amazon.co.uk>
Commit-ID: f14fd95d2f3e611619756ea3c008aee3b4bd4978
Gitweb: https://git.kernel.org/tip/f14fd95d2f3e611619756ea3c008aee3b4bd4978
Author: David Woodhouse <dwmw@amazon.co.uk>
AuthorDate: Tue, 9 Jan 2018 14:43:13 +0000
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Wed, 10 Jan 2018 19:36:25 +0100
x86/retpoline/hyperv: Convert assembler indirect jumps
Convert all indirect jumps in hyperv inline asm code to use non-speculative
sequences when CONFIG_RETPOLINE is enabled.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Arjan van de Ven <arjan@linux.intel.com>
Acked-by: Ingo Molnar <mingo@kernel.org>
Cc: gnomes@lxorguk.ukuu.org.uk
Cc: Rik van Riel <riel@redhat.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Jiri Kosina <jikos@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Kees Cook <keescook@google.com>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@linux-foundation.org>
Cc: Paul Turner <pjt@google.com>
Link: https://lkml.kernel.org/r/1515508997-6154-8-git-send-email-dwmw@amazon.co.uk
---
arch/x86/include/asm/mshyperv.h | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h
index 581bb54..5119e4b 100644
--- a/arch/x86/include/asm/mshyperv.h
+++ b/arch/x86/include/asm/mshyperv.h
@@ -7,6 +7,7 @@
#include <linux/nmi.h>
#include <asm/io.h>
#include <asm/hyperv.h>
+#include <asm/nospec-branch.h>
/*
* The below CPUID leaves are present if VersionAndFeatures.HypervisorPresent
@@ -186,10 +187,11 @@ static inline u64 hv_do_hypercall(u64 control, void *input, void *output)
return U64_MAX;
__asm__ __volatile__("mov %4, %%r8\n"
- "call *%5"
+ CALL_NOSPEC
: "=a" (hv_status), ASM_CALL_CONSTRAINT,
"+c" (control), "+d" (input_address)
- : "r" (output_address), "m" (hv_hypercall_pg)
+ : "r" (output_address),
+ THUNK_TARGET(hv_hypercall_pg)
: "cc", "memory", "r8", "r9", "r10", "r11");
#else
u32 input_address_hi = upper_32_bits(input_address);
@@ -200,13 +202,13 @@ static inline u64 hv_do_hypercall(u64 control, void *input, void *output)
if (!hv_hypercall_pg)
return U64_MAX;
- __asm__ __volatile__("call *%7"
+ __asm__ __volatile__(CALL_NOSPEC
: "=A" (hv_status),
"+c" (input_address_lo), ASM_CALL_CONSTRAINT
: "A" (control),
"b" (input_address_hi),
"D"(output_address_hi), "S"(output_address_lo),
- "m" (hv_hypercall_pg)
+ THUNK_TARGET(hv_hypercall_pg)
: "cc", "memory");
#endif /* !x86_64 */
return hv_status;
@@ -227,10 +229,10 @@ static inline u64 hv_do_fast_hypercall8(u16 code, u64 input1)
#ifdef CONFIG_X86_64
{
- __asm__ __volatile__("call *%4"
+ __asm__ __volatile__(CALL_NOSPEC
: "=a" (hv_status), ASM_CALL_CONSTRAINT,
"+c" (control), "+d" (input1)
- : "m" (hv_hypercall_pg)
+ : THUNK_TARGET(hv_hypercall_pg)
: "cc", "r8", "r9", "r10", "r11");
}
#else
@@ -238,13 +240,13 @@ static inline u64 hv_do_fast_hypercall8(u16 code, u64 input1)
u32 input1_hi = upper_32_bits(input1);
u32 input1_lo = lower_32_bits(input1);
- __asm__ __volatile__ ("call *%5"
+ __asm__ __volatile__ (CALL_NOSPEC
: "=A"(hv_status),
"+c"(input1_lo),
ASM_CALL_CONSTRAINT
: "A" (control),
"b" (input1_hi),
- "m" (hv_hypercall_pg)
+ THUNK_TARGET(hv_hypercall_pg)
: "cc", "edi", "esi");
}
#endif
next prev parent reply other threads:[~2018-01-10 18:48 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-09 14:43 [PATCH v7 00/11] Retpoline: Avoid speculative indirect calls in kernel David Woodhouse
2018-01-09 14:43 ` [PATCH v7 01/11] x86/retpoline: Add initial retpoline support David Woodhouse
2018-01-09 15:55 ` [tip:x86/pti] " tip-bot for David Woodhouse
2018-01-10 17:34 ` tip-bot for David Woodhouse
2018-01-10 18:13 ` tip-bot for David Woodhouse
2018-01-10 18:40 ` tip-bot for David Woodhouse
2018-01-09 14:43 ` [PATCH v7 02/11] x86/retpoline: Temporarily disable objtool when CONFIG_RETPOLINE=y David Woodhouse
2018-01-09 15:56 ` [tip:x86/pti] " tip-bot for Andi Kleen
2018-01-10 5:58 ` [PATCH v7 02/11] " Josh Poimboeuf
2018-01-10 10:12 ` Peter Zijlstra
2018-01-10 17:34 ` [tip:x86/pti] " tip-bot for Andi Kleen
2018-01-10 18:13 ` tip-bot for Andi Kleen
2018-01-10 18:40 ` tip-bot for Andi Kleen
2018-01-09 14:43 ` [PATCH v7 03/11] x86/spectre: Add boot time option to select Spectre v2 mitigation David Woodhouse
2018-01-09 15:56 ` [tip:x86/pti] " tip-bot for David Woodhouse
2018-01-10 17:35 ` tip-bot for David Woodhouse
2018-01-10 18:03 ` Tom Lendacky
2018-01-10 18:06 ` Thomas Gleixner
2018-01-10 18:10 ` Thomas Gleixner
2018-01-10 18:14 ` tip-bot for David Woodhouse
2018-01-10 18:33 ` Tom Lendacky
2018-01-10 18:35 ` Thomas Gleixner
2018-01-10 18:41 ` tip-bot for David Woodhouse
2018-01-09 14:43 ` [PATCH v7 04/11] x86/retpoline/crypto: Convert crypto assembler indirect jumps David Woodhouse
2018-01-09 15:56 ` [tip:x86/pti] " tip-bot for David Woodhouse
2018-01-10 17:35 ` tip-bot for David Woodhouse
2018-01-10 18:14 ` tip-bot for David Woodhouse
2018-01-10 18:41 ` tip-bot for David Woodhouse
2018-01-09 14:43 ` [PATCH v7 05/11] x86/retpoline/entry: Convert entry " David Woodhouse
2018-01-09 15:57 ` [tip:x86/pti] " tip-bot for David Woodhouse
2018-01-10 3:54 ` [v7, 05/11] " Andrei Vagin
2018-01-10 4:30 ` Andi Kleen
2018-01-10 4:39 ` Dave Hansen
2018-01-10 5:23 ` Andrei Vagin
2018-01-10 17:36 ` [tip:x86/pti] " tip-bot for David Woodhouse
2018-01-10 18:15 ` tip-bot for David Woodhouse
2018-01-10 18:41 ` tip-bot for David Woodhouse
2018-01-09 14:43 ` [PATCH v7 06/11] x86/retpoline/ftrace: Convert ftrace " David Woodhouse
2018-01-09 15:57 ` [tip:x86/pti] " tip-bot for David Woodhouse
2018-01-10 17:36 ` tip-bot for David Woodhouse
2018-01-10 18:15 ` tip-bot for David Woodhouse
2018-01-10 18:42 ` tip-bot for David Woodhouse
2018-01-09 14:43 ` [PATCH v7 07/11] x86/retpoline/hyperv: Convert " David Woodhouse
2018-01-09 15:58 ` [tip:x86/pti] " tip-bot for David Woodhouse
2018-01-10 17:37 ` tip-bot for David Woodhouse
2018-01-10 18:15 ` tip-bot for David Woodhouse
2018-01-10 18:42 ` tip-bot for David Woodhouse [this message]
2018-01-09 14:43 ` [PATCH v7 08/11] x86/retpoline/xen: Convert Xen hypercall " David Woodhouse
2018-01-09 15:58 ` [tip:x86/pti] " tip-bot for David Woodhouse
2018-01-10 17:37 ` tip-bot for David Woodhouse
2018-01-10 18:16 ` tip-bot for David Woodhouse
2018-01-10 18:43 ` tip-bot for David Woodhouse
2018-01-09 14:43 ` [PATCH v7 09/11] x86/retpoline/checksum32: Convert assembler " David Woodhouse
2018-01-09 15:58 ` [tip:x86/pti] " tip-bot for David Woodhouse
2018-01-10 17:37 ` tip-bot for David Woodhouse
2018-01-10 18:16 ` tip-bot for David Woodhouse
2018-01-10 18:43 ` tip-bot for David Woodhouse
2018-01-09 14:43 ` [PATCH v7 10/11] x86/retpoline/irq32: " David Woodhouse
2018-01-09 15:59 ` [tip:x86/pti] " tip-bot for Andi Kleen
2018-01-10 17:38 ` tip-bot for Andi Kleen
2018-01-10 18:17 ` tip-bot for Andi Kleen
2018-01-10 18:43 ` tip-bot for Andi Kleen
2018-01-09 14:43 ` [PATCH v7 11/11] x86/retpoline: Avoid return buffer underflows on context switch David Woodhouse
2018-01-09 15:59 ` [tip:x86/pti] " tip-bot for Andi Kleen
2018-01-11 21:46 [PATCH v8 08/12] x86/retpoline/hyperv: Convert assembler indirect jumps David Woodhouse
2018-01-11 23:25 ` [tip:x86/pti] " tip-bot for David Woodhouse
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=tip-f14fd95d2f3e611619756ea3c008aee3b4bd4978@git.kernel.org \
--to=tipbot@zytor.com \
--cc=ak@linux.intel.com \
--cc=arjan@linux.intel.com \
--cc=dave.hansen@intel.com \
--cc=dwmw@amazon.co.uk \
--cc=gregkh@linux-foundation.org \
--cc=hpa@zytor.com \
--cc=jikos@kernel.org \
--cc=keescook@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=pjt@google.com \
--cc=riel@redhat.com \
--cc=tglx@linutronix.de \
--cc=tim.c.chen@linux.intel.com \
--cc=torvalds@linux-foundation.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).