From 836685fe61d4224dcf90b34b71770ffa48ba011c Mon Sep 17 00:00:00 2001 From: Eddie Dong Date: Sun, 11 Nov 2007 12:28:35 +0200 Subject: [PATCH] --- yaml --- r: 80713 b: refs/heads/master c: e5edaa01c4cea5f60c617fac989c6458df0ecc4e h: refs/heads/master i: 80711: 8f0494c08043543fc01e4f71d0be6955e4a5d8af v: v3 --- [refs] | 2 +- trunk/drivers/kvm/vmx.c | 11 ++++++++++- trunk/drivers/kvm/vmx.h | 2 ++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a74041afa80a..19297931de9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a70cc3d0f4877f862ac9cace2e61e4e5116b502 +refs/heads/master: e5edaa01c4cea5f60c617fac989c6458df0ecc4e diff --git a/trunk/drivers/kvm/vmx.c b/trunk/drivers/kvm/vmx.c index 26719aa9701e..c3bde7532714 100644 --- a/trunk/drivers/kvm/vmx.c +++ b/trunk/drivers/kvm/vmx.c @@ -980,7 +980,8 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf) #endif if (_cpu_based_exec_control & CPU_BASED_ACTIVATE_SECONDARY_CONTROLS) { min = 0; - opt = SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES; + opt = SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES | + SECONDARY_EXEC_WBINVD_EXITING; if (adjust_vmx_controls(min, opt, MSR_IA32_VMX_PROCBASED_CTLS2, &_cpu_based_2nd_exec_control) < 0) return -EIO; @@ -2133,6 +2134,13 @@ static int handle_vmcall(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) return 1; } +static int handle_wbinvd(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) +{ + skip_emulated_instruction(vcpu); + /* TODO: Add support for VT-d/pass-through device */ + return 1; +} + static int handle_apic_access(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) { u64 exit_qualification; @@ -2174,6 +2182,7 @@ static int (*kvm_vmx_exit_handlers[])(struct kvm_vcpu *vcpu, [EXIT_REASON_VMCALL] = handle_vmcall, [EXIT_REASON_TPR_BELOW_THRESHOLD] = handle_tpr_below_threshold, [EXIT_REASON_APIC_ACCESS] = handle_apic_access, + [EXIT_REASON_WBINVD] = handle_wbinvd, }; static const int kvm_vmx_max_exit_handlers = diff --git a/trunk/drivers/kvm/vmx.h b/trunk/drivers/kvm/vmx.h index 6d32bc69285e..d52ae8d7303d 100644 --- a/trunk/drivers/kvm/vmx.h +++ b/trunk/drivers/kvm/vmx.h @@ -49,6 +49,7 @@ * Definitions of Secondary Processor-Based VM-Execution Controls. */ #define SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES 0x00000001 +#define SECONDARY_EXEC_WBINVD_EXITING 0x00000040 #define PIN_BASED_EXT_INTR_MASK 0x00000001 @@ -223,6 +224,7 @@ enum vmcs_field { #define EXIT_REASON_MWAIT_INSTRUCTION 36 #define EXIT_REASON_TPR_BELOW_THRESHOLD 43 #define EXIT_REASON_APIC_ACCESS 44 +#define EXIT_REASON_WBINVD 54 /* * Interruption-information format