Commit fee84b07 authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: VMX: Intercept RDPMC 



Intercept RDPMC and forward it to the PMU emulation code.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 332b56e4

arch/x86/kvm/vmx.c

+14 −1
Original line number Diff line number Diff line
@@ -1956,6 +1956,7 @@ static __init void nested_vmx_setup_ctls_msrs(void) 
#endif

		CPU_BASED_MOV_DR_EXITING | CPU_BASED_UNCOND_IO_EXITING |

		CPU_BASED_USE_IO_BITMAPS | CPU_BASED_MONITOR_EXITING |

		CPU_BASED_RDPMC_EXITING |

		CPU_BASED_ACTIVATE_SECONDARY_CONTROLS;

	/*

	 * 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_MWAIT_EXITING |

	      CPU_BASED_MONITOR_EXITING |

	      CPU_BASED_INVLPG_EXITING;

	      CPU_BASED_INVLPG_EXITING |

	      CPU_BASED_RDPMC_EXITING;



	if (yield_on_hlt)

		min |= CPU_BASED_HLT_EXITING;
@@ -4613,6 +4615,16 @@ static int handle_invlpg(struct kvm_vcpu *vcpu) 
	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)

{

	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_INVD]		      = handle_invd,

	[EXIT_REASON_INVLPG]		      = handle_invlpg,

	[EXIT_REASON_RDPMC]                   = handle_rdpmc,

	[EXIT_REASON_VMCALL]                  = handle_vmcall,

	[EXIT_REASON_VMCLEAR]	              = handle_vmclear,

	[EXIT_REASON_VMLAUNCH]                = handle_vmlaunch,