VPMU: Enable vpmu for svm
PATCH 3/4 VPMU: Enable vpmu for svm
Signed-off-by Wei Wang <[email protected]>
Signature · 11 lines
AMD GmbH, Germany Operating System Research Center Legal Information: Advanced Micro Devices GmbH Karl-Hammerschmidt-Str. 34 85609 Dornach b. München Geschäftsführer: Andrew Bowd, Thomas M. McCoy, Giuliano Meroni Sitz: Dornach, Gemeinde Aschheim, Landkreis München Registergericht München, HRB Nr. 43632
xen/arch/x86/hvm/svm/svm.c +30 -2
@@ -635,6 +635,7 @@ static void svm_ctxt_switch_from(structsvm_fpu_leave (v);svm_save_dr (v); +vpmu_save (v);svm_sync_vmcb (v);svm_vmload (root_vmcb[cpu]);
@@ -675,6 +676,7 @@ static void svm_ctxt_switch_to(struct vcsvm_vmsave (root_vmcb[cpu]);svm_vmload (v->arch.hvm_svm.vmcb); +vpmu_load (v);if ( cpu_has_rdtscp )wrmsrl (MSR_TSC_AUX ,hvm_msr_tsc_aux (v));
@@ -738,12 +740,15 @@ static int svm_vcpu_initialise(struct vcreturn rc; } +vpmu_initialise (v);return 0 ; }static void svm_vcpu_destroy (struct vcpu *v) {svm_destroy_vmcb (v); +vpmu_destroy (v); +passive_domain_destroy (v); } static void svm_inject_exception(
@@ -806,7 +811,7 @@ static int svm_event_pending(struct vcpustatic int svm_do_pmu_interrupt (struct cpu_user_regs *regs) { -return 0 ; +return vpmu_do_interrupt (regs); }static int svm_cpu_prepare (unsigned int cpu)
@@ -1042,6 +1047,17 @@ static int svm_msr_read_intercept(struct msr_content = vmcb->lastinttoip;break ; +case MSR_K7_PERFCTR0 : +case MSR_K7_PERFCTR1 : +case MSR_K7_PERFCTR2 : +case MSR_K7_PERFCTR3 : +case MSR_K7_EVNTSEL0 : +case MSR_K7_EVNTSEL1 : +case MSR_K7_EVNTSEL2 : +case MSR_K7_EVNTSEL3 : +vpmu_do_rdmsr (regs); + goto done; +default : if ( rdmsr_viridian_regs(ecx, &msr_content) ||
@@ -1060,6 +1076,7 @@ static int svm_msr_read_intercept(struct regs->eax = (uint32_t )msr_content; regs->edx = (uint32_t )(msr_content >>32 ); +done:HVMTRACE_3D (MSR_READ , ecx, regs->eax, regs->edx);HVM_DBG_LOG (DBG_LEVEL_1 ,"returns: ecx=%x, eax=%lx, edx=%lx" , ecx, (unsigned long )regs->eax, (unsigned long )regs->edx);
@@ -1124,6 +1141,17 @@ static int svm_msr_write_intercept(struc vmcb->lastinttoip = msr_content;break ; +case MSR_K7_PERFCTR0 : +case MSR_K7_PERFCTR1 : +case MSR_K7_PERFCTR2 : +case MSR_K7_PERFCTR3 : +case MSR_K7_EVNTSEL0 : +case MSR_K7_EVNTSEL1 : +case MSR_K7_EVNTSEL2 : +case MSR_K7_EVNTSEL3 : +vpmu_do_wrmsr (regs); + goto done; +default :if (wrmsr_viridian_regs (ecx, msr_content) )break ;
@@ -1140,7 +1168,7 @@ static int svm_msr_write_intercept(struc }break ; } - +done:return X86EMUL_OKAY ; gpf:
xen/arch/x86/hvm/vpmu.c +43 -8
75 lines not on this page · raw message
xen/include/asm-x86/hvm/svm/svm.h +1 -0
@@ -27,6 +27,7 @@#include <asm/processor.h> #include <asm/hvm/svm/vmcb.h> #include <asm/i387.h> +#include <asm/hvm/vpmu.h> void svm_dump_vmcb (const char *from,struct vmcb_struct *vmcb);
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel