Changeset 78978 in vbox for trunk/src

Timestamp:

Jun 5, 2019 6:25:09 AM (6 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:9180 Exception or NMI VM-exit handling. Fix EM to use renamed IEM function.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMVMXR0.cpp (modified) (3 diffs)
• VMMR3/EM.cpp (modified) (1 diff)

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

@@ -8811 +8811 @@
             if (   pVmxTransient->fIsNestedGuest
                 && CPUMIsGuestVmxPinCtlsSet(pVCpu, pCtx, VMX_PIN_CTLS_NMI_EXIT))
-            {
-                VBOXSTRICTRC rcStrict = IEMExecVmxVmexitNmi(pVCpu);
-                if (rcStrict != VINF_VMX_INTERCEPT_NOT_ACTIVE)
-                    return rcStrict;
-            }
+                return IEMExecVmxVmexitXcptNmi(pVCpu);
 #endif
             hmR0VmxSetPendingXcptNmi(pVCpu);
@@ -15805 +15801 @@
     uint32_t const uExtIntType = VMX_EXIT_INT_INFO_TYPE(uExitIntInfo);
 
+    /*
+     * Make sure not to use stale/previous VM-exit instruction length since we read the
+     * instruction length from the VMCS below only for software exceptions and privileged
+     * software exceptions but we pass it for all exception VM-exits below.
+     */
+    pVmxTransient->cbInstr = 0;
+
     switch (uExtIntType)
     {
@@ -15820 +15823 @@
          * Privileged software exceptions:
          *    Figure out if the exception must be delivered to the guest or the nested-guest.
+         *
+         *    For VM-exits due to software exceptions (those generated by INT3 or INTO) and privileged
+         *    software exceptions (those generated by INT1/ICEBP) we need to supply the VM-exit instruction
+         *    length.
          */
+        case VMX_EXIT_INT_INFO_TYPE_SW_XCPT:
+        case VMX_EXIT_INT_INFO_TYPE_PRIV_SW_XCPT:
+        {
+            rc = hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
+            RT_FALL_THRU();
+        }
         case VMX_EXIT_INT_INFO_TYPE_HW_XCPT:
         {
-#if 0
-            /* Page-faults are subject to masking using its error code. */
-            uint32_t fXcptBitmap = pVmcs->u32XcptBitmap;
+            rc = hmR0VmxReadExitIntErrorCodeVmcs(pVmxTransient);
+            AssertRCReturn(rc, rc);
+
+            uint8_t const  uVector    = VMX_EXIT_INT_INFO_VECTOR(uExitIntInfo);
+            bool const     fIntercept = CPUMIsGuestVmxXcptInterceptSet(pVCpu, &pVCpu->cpum.GstCtx, uVector,
+                                                                       pVmxTransient->uExitIntErrorCode);
+            if (fIntercept)
+            {
+                rc  = hmR0VmxReadExitQualVmcs(pVCpu, pVmxTransient);
+                rc |= hmR0VmxReadIdtVectoringInfoVmcs(pVmxTransient);
+                rc |= hmR0VmxReadIdtVectoringErrorCodeVmcs(pVmxTransient);
+                AssertRCReturn(rc, rc);
+
+                VMXVEXITINFO ExitInfo;
+                RT_ZERO(ExitInfo);
+                ExitInfo.cbInstr = pVmxTransient->cbInstr;
+                ExitInfo.u64Qual = pVmxTransient->uExitQual;
+
+                VMXVEXITEVENTINFO ExitEventInfo;
+                RT_ZERO(ExitInfo);
+                ExitEventInfo.uExitIntInfo         = pVmxTransient->uExitIntInfo;
+                ExitEventInfo.uExitIntErrCode      = pVmxTransient->uExitIntErrorCode;
+                ExitEventInfo.uIdtVectoringInfo    = pVmxTransient->uIdtVectoringInfo;
+                ExitEventInfo.uIdtVectoringErrCode = pVmxTransient->uIdtVectoringErrorCode;
+
+                return IEMExecVmxVmexitXcpt(pVCpu, &ExitInfo, &ExitEventInfo);
+            }
+
+            /* If it was a #PF and the nested-guest is not intercepting it, forward it to the guest. */
             if (uVector == X86_XCPT_PF)
             {
-                uint32_t const fXcptPFMask  = pVmcs->u32XcptPFMask;
-                uint32_t const fXcptPFMatch = pVmcs->u32XcptPFMatch;
-                if ((uErrCode & fXcptPFMask) != fXcptPFMatch)
-                    fXcptBitmap ^= RT_BIT(X86_XCPT_PF);
+                if (pVCpu->CTX_SUFF(pVM)->hm.s.fNestedPaging)
+                {
+                    rc  = hmR0VmxReadExitIntErrorCodeVmcs(pVmxTransient);
+                    rc |= hmR0VmxReadExitQualVmcs(pVCpu, pVmxTransient);
+                    AssertRCReturn(rc, rc);
+
+                    hmR0VmxSetPendingEvent(pVCpu, VMX_ENTRY_INT_INFO_FROM_EXIT_INT_INFO(uExitIntInfo), 0 /* cbInstr */,
+                                           pVmxTransient->uExitIntErrorCode, pVmxTransient->uExitQual);
+                }
+                return hmR0VmxExitXcptPF(pVCpu, pVmxTransient);
             }
-
-            /* Consult the exception bitmap for all other hardware exceptions. */
-            Assert(uVector <= X86_XCPT_LAST);
-            if (fXcptBitmap & RT_BIT(uVector))
-                fIntercept = true;
-#endif
             break;
         }

trunk/src/VBox/VMM/VMMR3/EM.cpp

@@ -2236 +2236 @@
                              && CPUMIsGuestVmxPinCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PIN_CTLS_NMI_EXIT))
                     {
-                        rc2 = VBOXSTRICTRC_VAL(IEMExecVmxVmexitNmi(pVCpu));
+                        rc2 = VBOXSTRICTRC_VAL(IEMExecVmxVmexitXcptNmi(pVCpu));
                         Assert(rc2 != VINF_VMX_INTERCEPT_NOT_ACTIVE);
                         UPDATE_RC();