Commit 9ee73970 authored Mar 06, 2012 by Avi Kivity

KVM: VMX: Fix delayed load of shared MSRs



Shared MSRs (MSR_*STAR and related) are stored in both vmx->guest_msrs
and in the CPU registers, but vmx_set_msr() only updated memory. Prior
to 46199f33, this didn't matter, since we called vmx_load_host_state(),
which scheduled a vmx_save_host_state(), which re-synchronized the CPU
state, but now we don't, so the CPU state will not be synchronized until
the next exit to host userspace.  This mostly affects nested vmx workloads,
which play with these MSRs a lot.

Fix by loading the MSR eagerly.

Signed-off-by: Avi Kivity <avi@redhat.com>

parent bec87d6e

arch/x86/kvm/vmx.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -2210,6 +2210,9 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data)
		msr = find_msr_entry(vmx, msr_index);
		if (msr) {
		msr->data = data;
		if (msr - vmx->guest_msrs < vmx->save_nmsrs)
		kvm_set_shared_msr(msr->index, msr->data,
		msr->mask);
		break;
		}
		ret = kvm_set_msr_common(vcpu, msr_index, data);

Admin message