diff options
| author | Avi Kivity <avi@redhat.com> | 2012-03-06 13:16:33 +0100 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2012-03-08 13:11:55 +0100 |
| commit | 9ee73970c03edb68146ceb1ba2a7033c99a5e017 (patch) | |
| tree | 505ca7982d04d4ba670c2c8b2bad69adc71079cb /arch/x86/kvm | |
| parent | KVM: use correct tlbs dirty type in cmpxchg (diff) | |
| download | linux-9ee73970c03edb68146ceb1ba2a7033c99a5e017.tar.xz linux-9ee73970c03edb68146ceb1ba2a7033c99a5e017.zip | |
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 46199f33c2953, 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>
Diffstat (limited to 'arch/x86/kvm')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 124a0952a040..4a722a0b8e13 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -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); |