KVM: VMX: Intercept RDPMC
Intercept RDPMC and forward it to the PMU emulation code. Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
parent
332b56e484
commit
fee84b079d
|
@ -1956,6 +1956,7 @@ static __init void nested_vmx_setup_ctls_msrs(void)
|
||||||
#endif
|
#endif
|
||||||
CPU_BASED_MOV_DR_EXITING | CPU_BASED_UNCOND_IO_EXITING |
|
CPU_BASED_MOV_DR_EXITING | CPU_BASED_UNCOND_IO_EXITING |
|
||||||
CPU_BASED_USE_IO_BITMAPS | CPU_BASED_MONITOR_EXITING |
|
CPU_BASED_USE_IO_BITMAPS | CPU_BASED_MONITOR_EXITING |
|
||||||
|
CPU_BASED_RDPMC_EXITING |
|
||||||
CPU_BASED_ACTIVATE_SECONDARY_CONTROLS;
|
CPU_BASED_ACTIVATE_SECONDARY_CONTROLS;
|
||||||
/*
|
/*
|
||||||
* We can allow some features even when not supported by the
|
* We can allow some features even when not supported by the
|
||||||
|
@ -2410,7 +2411,8 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf)
|
||||||
CPU_BASED_USE_TSC_OFFSETING |
|
CPU_BASED_USE_TSC_OFFSETING |
|
||||||
CPU_BASED_MWAIT_EXITING |
|
CPU_BASED_MWAIT_EXITING |
|
||||||
CPU_BASED_MONITOR_EXITING |
|
CPU_BASED_MONITOR_EXITING |
|
||||||
CPU_BASED_INVLPG_EXITING;
|
CPU_BASED_INVLPG_EXITING |
|
||||||
|
CPU_BASED_RDPMC_EXITING;
|
||||||
|
|
||||||
if (yield_on_hlt)
|
if (yield_on_hlt)
|
||||||
min |= CPU_BASED_HLT_EXITING;
|
min |= CPU_BASED_HLT_EXITING;
|
||||||
|
@ -4613,6 +4615,16 @@ static int handle_invlpg(struct kvm_vcpu *vcpu)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int handle_rdpmc(struct kvm_vcpu *vcpu)
|
||||||
|
{
|
||||||
|
int err;
|
||||||
|
|
||||||
|
err = kvm_rdpmc(vcpu);
|
||||||
|
kvm_complete_insn_gp(vcpu, err);
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
static int handle_wbinvd(struct kvm_vcpu *vcpu)
|
static int handle_wbinvd(struct kvm_vcpu *vcpu)
|
||||||
{
|
{
|
||||||
skip_emulated_instruction(vcpu);
|
skip_emulated_instruction(vcpu);
|
||||||
|
@ -5563,6 +5575,7 @@ static int (*kvm_vmx_exit_handlers[])(struct kvm_vcpu *vcpu) = {
|
||||||
[EXIT_REASON_HLT] = handle_halt,
|
[EXIT_REASON_HLT] = handle_halt,
|
||||||
[EXIT_REASON_INVD] = handle_invd,
|
[EXIT_REASON_INVD] = handle_invd,
|
||||||
[EXIT_REASON_INVLPG] = handle_invlpg,
|
[EXIT_REASON_INVLPG] = handle_invlpg,
|
||||||
|
[EXIT_REASON_RDPMC] = handle_rdpmc,
|
||||||
[EXIT_REASON_VMCALL] = handle_vmcall,
|
[EXIT_REASON_VMCALL] = handle_vmcall,
|
||||||
[EXIT_REASON_VMCLEAR] = handle_vmclear,
|
[EXIT_REASON_VMCLEAR] = handle_vmclear,
|
||||||
[EXIT_REASON_VMLAUNCH] = handle_vmlaunch,
|
[EXIT_REASON_VMLAUNCH] = handle_vmlaunch,
|
||||||
|
|
Loading…
Reference in New Issue