diff mbox series

[02/43] kvm: nVMX: small cleanup in handle_exception

Message ID	1560445409-17363-3-git-send-email-pbonzini@redhat.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <kvm-owner@kernel.org> From: Paolo Bonzini <pbonzini@redhat.com> To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Sean Christopherson <sean.j.christopherson@intel.com>, vkuznets@redhat.com Subject: [PATCH 02/43] kvm: nVMX: small cleanup in handle_exception Date: Thu, 13 Jun 2019 19:02:48 +0200 Message-Id: <1560445409-17363-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1560445409-17363-1-git-send-email-pbonzini@redhat.com> References: <1560445409-17363-1-git-send-email-pbonzini@redhat.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk
Series	VMX optimizations \| expand [00/43] VMX optimizations [01/43] KVM: VMX: Fix handling of #MC that occurs during VM-Entry [02/43] kvm: nVMX: small cleanup in handle_exception [03/43] KVM: VMX: Read cached VM-Exit reason to detect external interrupt [04/43] KVM: VMX: Store the host kernel's IDT base in a global variable [05/43] KVM: x86: Move kvm_{before,after}_interrupt() calls to vendor code [06/43] KVM: VMX: Handle NMIs, #MCs and async #PFs in common irqs-disabled fn [07/43] KVM: nVMX: Intercept VMWRITEs to read-only shadow VMCS fields [08/43] KVM: nVMX: Intercept VMWRITEs to GUEST_{CS,SS}_AR_BYTES [09/43] KVM: nVMX: Track vmcs12 offsets for shadowed VMCS fields [10/43] KVM: nVMX: Lift sync_vmcs12() out of prepare_vmcs12() [11/43] KVM: nVMX: Use descriptive names for VMCS sync functions and flags [12/43] KVM: nVMX: Add helpers to identify shadowed VMCS fields [13/43] KVM: nVMX: Sync rarely accessed guest fields only when needed [14/43] KVM: nVMX: Rename prepare_vmcs02__full to prepare_vmcs02__rare [15/43] KVM: VMX: Always signal #GP on WRMSR to MSR_IA32_CR_PAT with bad value [16/43] KVM: nVMX: Always sync GUEST_BNDCFGS when it comes from vmcs01 [17/43] KVM: nVMX: Write ENCLS-exiting bitmap once per vmcs02 [18/43] KVM: nVMX: Don't rewrite GUEST_PML_INDEX during nested VM-Entry [19/43] KVM: VMX: simplify vmx_prepare_switch_to_{guest,host} [20/43] KVM: nVMX: Don't "put" vCPU or host state when switching VMCS [21/43] KVM: nVMX: Don't reread VMCS-agnostic state when switching VMCS [22/43] KVM: nVMX: Don't dump VMCS if virtual APIC page can't be mapped [23/43] KVM: nVMX: Don't speculatively write virtual-APIC page address [24/43] KVM: nVMX: Don't speculatively write APIC-access page address [25/43] KVM: nVMX: Update vmcs12 for MSR_IA32_CR_PAT when it's written [26/43] KVM: nVMX: Update vmcs12 for SYSENTER MSRs when they're written [27/43] KVM: nVMX: Update vmcs12 for MSR_IA32_DEBUGCTLMSR when it's written [28/43] KVM: nVMX: Don't update GUEST_BNDCFGS if it's clean in HV eVMCS [29/43] KVM: x86: introduce is_pae_paging [30/43] KVM: nVMX: Copy PDPTRs to/from vmcs12 only when necessary [31/43] KVM: nVMX: Use adjusted pin controls for vmcs02 [32/43] KVM: VMX: Add builder macros for shadowing controls [33/43] KVM: VMX: Shadow VMCS pin controls [34/43] KVM: VMX: Shadow VMCS primary execution controls [35/43] KVM: VMX: Shadow VMCS secondary execution controls [36/43] KVM: nVMX: Shadow VMCS controls on a per-VMCS basis [37/43] KVM: nVMX: Don't reset VMCS controls shadow on VMCS switch [38/43] KVM: VMX: Explicitly initialize controls shadow at VMCS allocation [39/43] KVM: nVMX: Preserve last USE_MSR_BITMAPS when preparing vmcs02 [40/43] KVM: nVMX: Preset *DT exiting in vmcs02 when emulating UMIP [41/43] KVM: VMX: Drop hv_timer_armed from 'struct loaded_vmcs' [42/43] KVM: VMX: Leave preemption timer running when it's disabled [43/43] KVM: nVMX: shadow pin based execution controls

Commit Message

Paolo Bonzini June 13, 2019, 5:02 p.m. UTC

The reason for skipping handling of NMI and #MC in handle_exception is
the same, namely they are handled earlier by vmx_complete_atomic_exit.
Calling the machine check handler (which just returns 1) is misleading,
don't do it.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 arch/x86/kvm/vmx/vmx.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff mbox series

Patch

diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 1b3ca0582a0c..da6c829bad9f 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -4455,11 +4455,8 @@  static int handle_exception(struct kvm_vcpu *vcpu)
 	vect_info = vmx->idt_vectoring_info;
 	intr_info = vmx->exit_intr_info;
 
-	if (is_machine_check(intr_info))
-		return handle_machine_check(vcpu);
-
-	if (is_nmi(intr_info))
-		return 1;  /* already handled by vmx_vcpu_run() */
+	if (is_machine_check(intr_info) || is_nmi(intr_info))
+		return 1;  /* already handled by vmx_complete_atomic_exit */
 
 	if (is_invalid_opcode(intr_info))
 		return handle_ud(vcpu);