diff options
| author | Sean Christopherson <sean.j.christopherson@intel.com> | 2018-09-26 09:23:56 -0700 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2018-10-17 00:29:59 +0200 |
| commit | 5a5e8a15d76e6dd62e3a94fea499057bd048abbc (patch) | |
| tree | 7561a66efc18d786dd011a1980e56590225ec815 /arch/x86/kvm | |
| parent | 09abb5e3e5e50eef72b09adaa798b7ef0ce9239b (diff) | |
| download | blackbird-obmc-linux-5a5e8a15d76e6dd62e3a94fea499057bd048abbc.tar.gz blackbird-obmc-linux-5a5e8a15d76e6dd62e3a94fea499057bd048abbc.zip | |
KVM: vmx: write HOST_IA32_EFER in vmx_set_constant_host_state()
EFER is constant in the host and writing it once during setup means
we can skip writing the host value in add_atomic_switch_msr_special().
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Reviewed-by: Jim Mattson <jmattson@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 2d120de9054e..5367afe92c99 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -2696,7 +2696,8 @@ static void add_atomic_switch_msr_special(struct vcpu_vmx *vmx, u64 guest_val, u64 host_val) { vmcs_write64(guest_val_vmcs, guest_val); - vmcs_write64(host_val_vmcs, host_val); + if (host_val_vmcs != HOST_IA32_EFER) + vmcs_write64(host_val_vmcs, host_val); vm_entry_controls_setbit(vmx, entry); vm_exit_controls_setbit(vmx, exit); } @@ -6333,6 +6334,9 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx) rdmsr(MSR_IA32_CR_PAT, low32, high32); vmcs_write64(HOST_IA32_PAT, low32 | ((u64) high32 << 32)); } + + if (cpu_has_load_ia32_efer) + vmcs_write64(HOST_IA32_EFER, host_efer); } static void set_cr4_guest_host_mask(struct vcpu_vmx *vmx) |
