KVM/x86: Move definition of __ex to x86.h
PATCH 1/1 KVM/x86: Move definition of __ex to x86.h
Merge __kvm_handle_fault_on_reboot with its sole user and move the definition of __ex to a common include to be shared between VMX and SVM.
Cc Paolo Bonzini <[email protected]>
Cc Sean Christopherson <[email protected]>
Signed-off-by Uros Bizjak <[email protected]>
--- arch/x86/include/asm/kvm_host.h | 25 ------------------------- arch/x86/kvm/svm/svm.c | 2 -- arch/x86/kvm/vmx/vmx_ops.h | 4 +--- arch/x86/kvm/x86.h | 23 +++++++++++++++++++++++ 4 files changed, 24 insertions(+), 30 deletions(-)
arch/x86/include/asm/kvm_host.h +0 -25
@@ -1623,31 +1623,6 @@ enum {#define kvm_arch_vcpu_memslots_id (vcpu) ((vcpu)->arch.hflags & HF_SMM_MASK ? 1 : 0)#define kvm_memslots_for_spte_role (kvm, role) __kvm_memslots(kvm, (role).smm) -asmlinkage void kvm_spurious_fault(void); - -/* -* Hardware virtualization extension instructions may fault if a -* reboot turns off virtualization while processes are running. -* Usually after catching the fault we just panic; during reboot -* instead the instruction is ignored. -*/ -#define __kvm_handle_fault_on_reboot (insn) \ - "666: \n\t" \ - insn "\n\t" \ - "jmp 668f \n\t" \ - "667: \n\t" \ - "1: \n\t" \ - ".pushsection .discard.instr_begin \n\t" \ - ".long 1b - . \n\t" \ - ".popsection \n\t" \ - "call kvm_spurious_fault \n\t" \ - "1: \n\t" \ - ".pushsection .discard.instr_end \n\t" \ - ".long 1b - . \n\t" \ - ".popsection \n\t" \ - "668: \n\t" \ - _ASM_EXTABLE(666b, 667b) -#define KVM_ARCH_WANT_MMU_NOTIFIER int kvm_unmap_hva_range (struct kvm *kvm,unsigned long start,unsigned long end,unsigned flags);
arch/x86/kvm/svm/svm.c +0 -2
@@ -42,8 +42,6 @@#include "svm.h" -#define __ex (x) __kvm_handle_fault_on_reboot(x) -MODULE_AUTHOR ("Qumranet" );MODULE_LICENSE ("GPL" );
arch/x86/kvm/vmx/vmx_ops.h +1 -3
@@ -4,13 +4,11 @@#include <linux/nospec.h> -#include <asm/kvm_host.h> #include <asm/vmx.h> #include "evmcs.h" #include "vmcs.h" - -#define __ex (x) __kvm_handle_fault_on_reboot(x) +#include "x86.h" asmlinkage void vmread_error(unsigned long field, bool fault); __attribute__((regparm(0))) void vmread_error_trampoline(unsigned long field,
arch/x86/kvm/x86.h +23 -0
@@ -7,6 +7,29 @@#include "kvm_cache_regs.h" #include "kvm_emulate.h" +asmlinkage void kvm_spurious_fault(void); + +/* +* Hardware virtualization extension instructions may fault if a +* reboot turns off virtualization while processes are running. +* Usually after catching the fault we just panic; during reboot +* instead the instruction is ignored. +*/ +#define __ex (insn) \ + "666: " insn "\n" \ + " jmp 669f\n" \ + "667:\n" \ + ".pushsection .discard.instr_begin\n" \ + ".long 667b - .\n" \ + ".popsection\n" \ + " call kvm_spurious_fault\n" \ + "668:\n" \ + ".pushsection .discard.instr_end\n" \ + ".long 668b - .\n" \ + ".popsection\n" \ + "669:\n" \ + _ASM_EXTABLE(666b, 667b) +#define KVM_DEFAULT_PLE_GAP 128#define KVM_VMX_DEFAULT_PLE_WINDOW 4096#define KVM_DEFAULT_PLE_WINDOW_GROW 2
Signature · 1 line
2.26.2
Quoted 106 lines · Uros Bizjak
Merge
__kvm_handle_fault_on_rebootwith its sole user and move the definition of__exto a common include to be shared between VMX and SVM.Cc Paolo Bonzini <[email protected]>Cc Sean Christopherson <[email protected]>Signed-off-by Uros Bizjak <[email protected]>--- arch/x86/include/asm/kvm_host.h | 25 ------------------------- arch/x86/kvm/svm/svm.c | 2 -- arch/x86/kvm/vmx/vmx_ops.h | 4 +--- arch/x86/kvm/x86.h | 23 +++++++++++++++++++++++ 4 files changed, 24 insertions(+), 30 deletions(-)arch/x86/include/asm/kvm_host.h +0
-25@@ -1623,31 +1623,6 @@ enum {#define kvm_arch_vcpu_memslots_id (vcpu) ((vcpu)->arch.hflags & HF_SMM_MASK ? 1 : 0)#define kvm_memslots_for_spte_role (kvm, role) __kvm_memslots(kvm, (role).smm) -asmlinkage void kvm_spurious_fault(void); - -/* -* Hardware virtualization extension instructions may fault if a -* reboot turns off virtualization while processes are running. -* Usually after catching the fault we just panic; during reboot -* instead the instruction is ignored. -*/ -#define __kvm_handle_fault_on_reboot (insn) \ - "666: \n\t" \ - insn "\n\t" \ - "jmp 668f \n\t" \ - "667: \n\t" \ - "1: \n\t" \ - ".pushsection .discard.instr_begin \n\t" \ - ".long 1b - . \n\t" \ - ".popsection \n\t" \ - "call kvm_spurious_fault \n\t" \ - "1: \n\t" \ - ".pushsection .discard.instr_end \n\t" \ - ".long 1b - . \n\t" \ - ".popsection \n\t" \ - "668: \n\t" \ - _ASM_EXTABLE(666b, 667b) -#define KVM_ARCH_WANT_MMU_NOTIFIER int kvm_unmap_hva_range (struct kvm *kvm,unsigned long start,unsigned long end,unsigned flags);arch/x86/kvm/svm/svm.c +0
-2@@ -42,8 +42,6 @@#include "svm.h" -#define __ex (x) __kvm_handle_fault_on_reboot(x) -MODULE_AUTHOR ("Qumranet" );MODULE_LICENSE ("GPL" );arch/x86/kvm/vmx/vmx_ops.h +1
-3@@ -4,13 +4,11 @@#include <linux/nospec.h> -#include <asm/kvm_host.h> #include <asm/vmx.h> #include "evmcs.h" #include "vmcs.h" - -#define __ex (x) __kvm_handle_fault_on_reboot(x) +#include "x86.h" asmlinkage void vmread_error(unsigned long field, bool fault); __attribute__((regparm(0))) void vmread_error_trampoline(unsigned long field,arch/x86/kvm/x86.h +16
-0@@ -7,6 +7,29 @@#include "kvm_cache_regs.h" #include "kvm_emulate.h" +asmlinkage void kvm_spurious_fault(void); + +/* +* Hardware virtualization extension instructions may fault if a +* reboot turns off virtualization while processes are running. +* Usually after catching the fault we just panic; during reboot +* instead the instruction is ignored. +*/ +#define __ex (insn) \ + "666: " insn "\n" \ + " jmp 669f\n" \ + "667:\n" \ + ".pushsection .discard.instr_begin\n" \ + ".long 667b - .\n" \ + ".popsection\n" \ + " call kvm_spurious_fault\n" \
arch/x86/kvm/x86.h line 35
Quoted 10 lines
arch/x86/kvm/x86.h +7
-0+"668:\n" \ +".pushsection .discard.instr_end\n" \ +".long 668b - .\n" \ +".popsection\n" \ +"669:\n" \ + _ASM_EXTABLE(666b, 667b) +#define KVM_DEFAULT_PLE_GAP 128#define KVM_VMX_DEFAULT_PLE_WINDOW 4096#define KVM_DEFAULT_PLE_WINDOW_GROW 2
Reviewed-by Krish Sadhukhan <[email protected]>