summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorSean Christopherson <sean.j.christopherson@intel.com>2019-05-07 21:17:59 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2019-06-18 11:47:44 +0200
commitae81d08993cbc515e3181ee6bebce5cd878133f2 (patch)
tree8079677ff8135a41cf02d2e76cb9761a0e2f5db6 /arch/x86
parentKVM: nVMX: Shadow VMCS controls on a per-VMCS basis (diff)
downloadlinux-ae81d08993cbc515e3181ee6bebce5cd878133f2.tar.xz
linux-ae81d08993cbc515e3181ee6bebce5cd878133f2.zip
KVM: nVMX: Don't reset VMCS controls shadow on VMCS switch
... now that the shadow copies are per-VMCS. Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kvm/vmx/nested.c5
-rw-r--r--arch/x86/kvm/vmx/vmx.h4
2 files changed, 0 insertions, 9 deletions
diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
index 21cb6cd88765..d4f529a2e194 100644
--- a/arch/x86/kvm/vmx/nested.c
+++ b/arch/x86/kvm/vmx/nested.c
@@ -283,11 +283,6 @@ static void vmx_switch_vmcs(struct kvm_vcpu *vcpu, struct loaded_vmcs *vmcs)
vmx_sync_vmcs_host_state(vmx, prev);
put_cpu();
- vm_entry_controls_reset_shadow(vmx);
- vm_exit_controls_reset_shadow(vmx);
- pin_controls_reset_shadow(vmx);
- exec_controls_reset_shadow(vmx);
- secondary_exec_controls_reset_shadow(vmx);
vmx_segment_cache_clear(vmx);
}
diff --git a/arch/x86/kvm/vmx/vmx.h b/arch/x86/kvm/vmx/vmx.h
index ec11ecf6f040..52d7bc90d9ef 100644
--- a/arch/x86/kvm/vmx/vmx.h
+++ b/arch/x86/kvm/vmx/vmx.h
@@ -388,10 +388,6 @@ static inline u8 vmx_get_rvi(void)
}
#define BUILD_CONTROLS_SHADOW(lname, uname) \
-static inline void lname##_controls_reset_shadow(struct vcpu_vmx *vmx) \
-{ \
- vmx->loaded_vmcs->controls_shadow.lname = vmcs_read32(uname); \
-} \
static inline void lname##_controls_init(struct vcpu_vmx *vmx, u32 val) \
{ \
vmcs_write32(uname, val); \