Changeset 78878 in vbox

Timestamp:

May 30, 2019 12:01:19 PM (6 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Make unexpected error conditions as assertions for VM-exit handling.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -12665 +12665 @@
         case VMX_EXIT_WBINVD:                   return hmR0VmxExitWbinvdNested(pVCpu, pVmxTransient);
         case VMX_EXIT_MTF:                      return hmR0VmxExitMtfNested(pVCpu, pVmxTransient);
-
-        case VMX_EXIT_APIC_ACCESS:
+        case VMX_EXIT_APIC_ACCESS:              return hmR0VmxExitApicAccessNested(pVCpu, pVmxTransient);
+
+        /** @todo NSTVMX: APIC-access, Xcpt or NMI, Mov CRx. */
         case VMX_EXIT_XCPT_OR_NMI:
         {
-            /** @todo NSTVMX: APIC-access, Xcpt or NMI, Mov CRx. */
             return hmR0VmxExitErrUnexpected(pVCpu, pVmxTransient);
         }
@@ -16312 +16312 @@
     HMVMX_VALIDATE_NESTED_EXIT_HANDLER_PARAMS(pVCpu, pVmxTransient);
 
-    /*
-     * All VMCS controls that cause APIC-access VM-exits (Virtualize APIC access,
-     * virtual-interrupt delivery, APIC-register virtualization) are all taken
-     * directly from the guest-hypervisor. So there should be no need to re-verify
-     * them here.
-     *
-     * Only the VM-exit qualification is relevant here.
-     */
+    Assert(CPUMIsGuestVmxProcCtls2Set(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS2_VIRT_APIC_ACCESS));
     int rc = hmR0VmxReadExitQualVmcs(pVCpu, pVmxTransient);
     AssertRCReturn(rc, rc);
+
     return IEMExecVmxVmexit(pVCpu, pVmxTransient->uExitReason, pVmxTransient->uExitQual);
 }
@@ -16335 +16329 @@
     HMVMX_VALIDATE_NESTED_EXIT_HANDLER_PARAMS(pVCpu, pVmxTransient);
 
-    if (CPUMIsGuestVmxProcCtls2Set(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS2_DESC_TABLE_EXIT))
-    {
-        int rc = hmR0VmxReadExitQualVmcs(pVCpu, pVmxTransient);
-        rc    |= hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
-        rc    |= hmR0VmxReadExitInstrInfoVmcs(pVmxTransient);
-        AssertRCReturn(rc, rc);
-
-        VMXVEXITINFO ExitInfo;
-        RT_ZERO(ExitInfo);
-        ExitInfo.cbInstr   = pVmxTransient->cbInstr;
-        ExitInfo.u64Qual   = pVmxTransient->uExitQual;
-        ExitInfo.InstrInfo = pVmxTransient->ExitInstrInfo;
-        return IEMExecVmxVmexitInstrWithInfo(pVCpu, &ExitInfo);
-    }
-    return hmR0VmxExitErrUnexpected(pVCpu, pVmxTransient);
+    Assert(CPUMIsGuestVmxProcCtls2Set(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS2_DESC_TABLE_EXIT));
+    int rc = hmR0VmxReadExitQualVmcs(pVCpu, pVmxTransient);
+    rc    |= hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
+    rc    |= hmR0VmxReadExitInstrInfoVmcs(pVmxTransient);
+    AssertRCReturn(rc, rc);
+
+    VMXVEXITINFO ExitInfo;
+    RT_ZERO(ExitInfo);
+    ExitInfo.cbInstr   = pVmxTransient->cbInstr;
+    ExitInfo.u64Qual   = pVmxTransient->uExitQual;
+    ExitInfo.InstrInfo = pVmxTransient->ExitInstrInfo;
+    return IEMExecVmxVmexitInstrWithInfo(pVCpu, &ExitInfo);
 }