Commit 45133eca authored Aug 02, 2011 by Nadav Har'El Committed by Avi Kivity Sep 25, 2011

KVM: SVM: Fix TSC MSR read in nested SVM



When the TSC MSR is read by an L2 guest (when L1 allowed this MSR to be
read without exit), we need to return L2's notion of the TSC, not L1's.

The current code incorrectly returned L1 TSC, because svm_get_msr() was also
used in x86.c where this was assumed, but now that these places call the new
svm_read_l1_tsc(), the MSR read can be fixed.

Signed-off-by: Nadav Har'El <nyh@il.ibm.com>
Tested-by: Joerg Roedel <joerg.roedel@amd.com>
Acked-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

parent 27fc51b2

arch/x86/kvm/svm.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -2923,9 +2923,7 @@ static int svm_get_msr(struct kvm_vcpu vcpu, unsigned ecx, u64 data)

		switch (ecx) {
		case MSR_IA32_TSC: {
		struct vmcb *vmcb = get_host_vmcb(svm);

		*data = vmcb->control.tsc_offset +
		*data = svm->vmcb->control.tsc_offset +
		svm_scale_tsc(vcpu, native_read_tsc());

		break;

Admin message