Patch "x86/retpoline/hyperv: Convert assembler indirect jumps" has been added to the 4.4-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
x86/retpoline/hyperv: Convert assembler indirect jumps
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-retpoline-hyperv-convert-assembler-indirect-jumps.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
e70e5892b28c18f517f29ab6e83bd57705104b31Mon Sep 17 00:00:00 2001
From: David Woodhouse <[email protected]>
Date: Thu, 11 Jan 2018 21:46:30 +0000
Subject: x86/retpoline/hyperv: Convert assembler indirect jumps
From: David Woodhouse <[email protected]>
commit e70e5892b28c18f517f29ab6e83bd57705104b31 upstream.
Convert all indirect jumps in hyperv inline asm code to use non-speculative sequences when CONFIG_RETPOLINE is enabled.
--- drivers/hv/hv.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/hv/hv.c +7 -4
@@ -31,6 +31,7 @@#include <linux/clockchips.h> #include <asm/hyperv.h> #include <asm/mshyperv.h> +#include <asm/nospec-branch.h> #include "hyperv_vmbus.h" /* The one and only */
@@ -103,9 +104,10 @@ static u64 do_hypercall(u64 control, voireturn (u64 )ULLONG_MAX ; __asm__ __volatile__("mov %0, %%r8" : :"r" (output_address) :"r8" ); - __asm__ __volatile__("call *%3" :"=a" (hv_status) : + __asm__ __volatile__(CALL_NOSPEC : + "=a" (hv_status) :"c" (control),"d" (input_address), -"m" (hypercall_page)); + THUNK_TARGET(hypercall_page));return hv_status;
@@ -123,11 +125,12 @@ static u64 do_hypercall(u64 control, voiif (!hypercall_page)return (u64 )ULLONG_MAX ; - __asm__ __volatile__ ("call *%8" :"=d" (hv_status_hi), + __asm__ __volatile__ (CALL_NOSPEC : "=d"(hv_status_hi), "=a"(hv_status_lo) : "d" (control_hi),"a" (control_lo),"b" (input_address_hi),"c" (input_address_lo),"D" (output_address_hi), -"S" (output_address_lo),"m" (hypercall_page)); +"S" (output_address_lo), + THUNK_TARGET(hypercall_page));return hv_status_lo | ((u64 )hv_status_hi <<32 );#endif /* !x86_64 */
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/x86-spectre-add-boot-time-option-to-select-spectre-v2-mitigation.patch queue-4.4/x86-retpoline-irq32-convert-assembler-indirect-jumps.patch queue-4.4/x86-retpoline-hyperv-convert-assembler-indirect-jumps.patch queue-4.4/x86-retpoline-entry-convert-entry-assembler-indirect-jumps.patch queue-4.4/x86-cpu-amd-make-lfence-a-serializing-instruction.patch queue-4.4/x86-retpoline-ftrace-convert-ftrace-assembler-indirect-jumps.patch queue-4.4/x86-retpoline-crypto-convert-crypto-assembler-indirect-jumps.patch queue-4.4/x86-retpoline-xen-convert-xen-hypercall-indirect-jumps.patch queue-4.4/x86-retpoline-checksum32-convert-assembler-indirect-jumps.patch queue-4.4/x86-mm-32-move-setup_clear_cpu_cap-x86_feature_pcid-earlier.patch queue-4.4/x86-retpoline-fill-return-stack-buffer-on-vmexit.patch queue-4.4/x86-retpoline-remove-compile-time-warning.patch queue-4.4/x86-cpu-amd-use-lfence_rdtsc-in-preference-to-mfence_rdtsc.patch queue-4.4/x86-retpoline-add-initial-retpoline-support.patch