diff options
| author | Avi Kivity <avi@redhat.com> | 2010-04-28 16:42:29 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-05-19 11:36:32 +0300 |
| commit | 84ad33ef5dbc12665ad42ee07a2daed473d3ec54 (patch) | |
| tree | 1adcc15df88e869c528ec0715504adec78a6c046 | |
| parent | 61d2ef2ce3e0161bedf5d2867f546a8df77fa9bc (diff) | |
| download | linux-84ad33ef5dbc12665ad42ee07a2daed473d3ec54.tar.gz linux-84ad33ef5dbc12665ad42ee07a2daed473d3ec54.tar.bz2 linux-84ad33ef5dbc12665ad42ee07a2daed473d3ec54.zip | |
KVM: VMX: Atomically switch efer if EPT && !EFER.NX
When EPT is enabled, we cannot emulate EFER.NX=0 through the shadow page
tables. This causes accesses through ptes with bit 63 set to succeed instead
of failing a reserved bit check.
Signed-off-by: Avi Kivity <avi@redhat.com>
| -rw-r--r-- | arch/x86/kvm/vmx.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index ae22dcf17211..c4f3955c64e0 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -678,6 +678,17 @@ static bool update_transition_efer(struct vcpu_vmx *vmx, int efer_offset) guest_efer |= host_efer & ignore_bits; vmx->guest_msrs[efer_offset].data = guest_efer; vmx->guest_msrs[efer_offset].mask = ~ignore_bits; + + clear_atomic_switch_msr(vmx, MSR_EFER); + /* On ept, can't emulate nx, and must switch nx atomically */ + if (enable_ept && ((vmx->vcpu.arch.efer ^ host_efer) & EFER_NX)) { + guest_efer = vmx->vcpu.arch.efer; + if (!(guest_efer & EFER_LMA)) + guest_efer &= ~EFER_LME; + add_atomic_switch_msr(vmx, MSR_EFER, guest_efer, host_efer); + return false; + } + return true; } @@ -1734,6 +1745,7 @@ static void exit_lmode(struct kvm_vcpu *vcpu) vmcs_write32(VM_ENTRY_CONTROLS, vmcs_read32(VM_ENTRY_CONTROLS) & ~VM_ENTRY_IA32E_MODE); + vmx_set_efer(vcpu, vcpu->arch.efer); } #endif |