From: Dong, E. <edd...@in...> - 2007-11-09 03:16:15
|
Add wbinvd VM Exit support to prepare for pass-through device cache emulation and also enhance real time responsibility. Signed-off-by: Yaozu (Eddie) Dong <edd...@in...> diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c index 6fc981d..6d80a41 100644 --- a/drivers/kvm/vmx.c +++ b/drivers/kvm/vmx.c @@ -972,7 +972,8 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf) #endif if (_cpu_based_exec_control & CPU_BASED_ACTIVATE_SECONDARY_CONTROLS) { min =3D 0; - opt =3D SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES; + opt =3D 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; @@ -2164,6 +2165,13 @@ static int handle_vmcall(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) return 1; } =20 +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; @@ -2205,6 +2213,7 @@ static int (*kvm_vmx_exit_handlers[])(struct kvm_vcpu *vcpu, [EXIT_REASON_VMCALL] =3D handle_vmcall, [EXIT_REASON_TPR_BELOW_THRESHOLD] =3D handle_tpr_below_threshold, [EXIT_REASON_APIC_ACCESS] =3D handle_apic_access, + [EXIT_REASON_WBINVD] =3D handle_wbinvd, }; =20 static const int kvm_vmx_max_exit_handlers =3D diff --git a/drivers/kvm/vmx.h b/drivers/kvm/vmx.h index 2ea35b9..5159374 100644 --- a/drivers/kvm/vmx.h +++ b/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 =20 =20 #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 =20 /* * Interruption-information format |