Changeset 78928 in vbox for trunk/src/VBox/VMM

Timestamp:

Jun 3, 2019 10:42:40 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

131049

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Partial exception/NMI VM-exit handling.

File:

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

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

@@ -412 +412 @@
  * @{
  */
-//static FNVMXEXITHANDLER            hmR0VmxExitXcptOrNmi;
+static FNVMXEXITHANDLER            hmR0VmxExitXcptOrNmiNested;
 //static FNVMXEXITHANDLER            hmR0VmxExitExtIntNested;
 static FNVMXEXITHANDLER            hmR0VmxExitTripleFaultNested;
@@ -8810 +8810 @@
             if (   pVmxTransient->fIsNestedGuest
                 && CPUMIsGuestVmxPinCtlsSet(pVCpu, pCtx, VMX_PIN_CTLS_NMI_EXIT))
-                return IEMExecVmxVmexitNmi(pVCpu);
+            {
+                VBOXSTRICTRC rcStrict = IEMExecVmxVmexitNmi(pVCpu);
+                if (rcStrict != VINF_VMX_INTERCEPT_NOT_ACTIVE)
+                    return rcStrict;
+            }
 #endif
             hmR0VmxSetPendingXcptNmi(pVCpu);
@@ -8823 +8827 @@
      * a valid interrupt we -must- deliver the interrupt. We can no longer re-request it from the APIC.
      */
-    else if (  VMCPU_FF_IS_ANY_SET(pVCpu, VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC)
-        && !pVCpu->hm.s.fSingleInstruction)
+    else if (    VMCPU_FF_IS_ANY_SET(pVCpu, VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC)
+             && !pVCpu->hm.s.fSingleInstruction)
     {
         Assert(!DBGFIsStepping(pVCpu));
@@ -8949 +8953 @@
         rcStrict = hmR0VmxInjectEventVmcs(pVCpu, pVmxTransient, &pVCpu->hm.s.Event, fStepping, &fIntrState);
         AssertRCReturn(VBOXSTRICTRC_VAL(rcStrict), rcStrict);
+
+        /*
+         * If we are executing a nested-guest make sure that we should intercept subsequent
+         * events. The one we are injecting might be part of VM-entry.
+         */
+        if (pVmxTransient->fIsNestedGuest)
+            pVCpu->cpum.GstCtx.hwvirt.vmx.fInterceptEvents = true;
 
         if (uIntType == VMX_ENTRY_INT_INFO_TYPE_EXT_INT)
@@ -10269 +10280 @@
     {
         Assert(pVM->hm.s.vmx.Msrs.ProcCtls2.n.allowed1 & VMX_PROC_CTLS2_PAUSE_LOOP_EXIT);
-        rc |= VMXWriteVmcs32(VMX_VMCS32_CTRL_PLE_GAP,    cPleGapTicks);
+        rc |= VMXWriteVmcs32(VMX_VMCS32_CTRL_PLE_GAP, cPleGapTicks);
         rc |= VMXWriteVmcs32(VMX_VMCS32_CTRL_PLE_WINDOW, cPleWindowTicks);
     }
@@ -12616 +12627 @@
         case VMX_EXIT_IO_INSTR:                 return hmR0VmxExitIoInstrNested(pVCpu, pVmxTransient);
         case VMX_EXIT_HLT:                      return hmR0VmxExitHltNested(pVCpu, pVmxTransient);
-        case VMX_EXIT_RDTSC:                    return hmR0VmxExitRdtscNested(pVCpu, pVmxTransient);
-        case VMX_EXIT_RDTSCP:                   return hmR0VmxExitRdtscpNested(pVCpu, pVmxTransient);
+        case VMX_EXIT_XCPT_OR_NMI:              return hmR0VmxExitXcptOrNmiNested(pVCpu, pVmxTransient);
+
+        /*
+         * We shouldn't direct host physical interrupts to the nested-guest.
+         */
+        case VMX_EXIT_EXT_INT:
+            return hmR0VmxExitExtInt(pVCpu, pVmxTransient);
 
         /*
@@ -12653 +12669 @@
             return hmR0VmxExitInstrWithInfoNested(pVCpu, pVmxTransient);
 
-        /*
-         * We shouldn't direct host physical interrupts to the nested-guest.
-         */
-        case VMX_EXIT_EXT_INT:
-            return hmR0VmxExitExtInt(pVCpu, pVmxTransient);
-
+        case VMX_EXIT_RDTSC:                    return hmR0VmxExitRdtscNested(pVCpu, pVmxTransient);
+        case VMX_EXIT_RDTSCP:                   return hmR0VmxExitRdtscpNested(pVCpu, pVmxTransient);
         case VMX_EXIT_RDMSR:                    return hmR0VmxExitRdmsrNested(pVCpu, pVmxTransient);
         case VMX_EXIT_WRMSR:                    return hmR0VmxExitWrmsrNested(pVCpu, pVmxTransient);
@@ -12667 +12679 @@
         case VMX_EXIT_MTF:                      return hmR0VmxExitMtfNested(pVCpu, pVmxTransient);
         case VMX_EXIT_APIC_ACCESS:              return hmR0VmxExitApicAccessNested(pVCpu, pVmxTransient);
-
-        /** @todo NSTVMX: APIC-access, Xcpt or NMI, Mov CRx. */
-        case VMX_EXIT_XCPT_OR_NMI:
-        {
-            return hmR0VmxExitErrUnexpected(pVCpu, pVmxTransient);
-        }
-
         case VMX_EXIT_MOV_CRX:                  return hmR0VmxExitMovCRxNested(pVCpu, pVmxTransient);
         case VMX_EXIT_INT_WINDOW:               return hmR0VmxExitIntWindowNested(pVCpu, pVmxTransient);
@@ -13052 +13057 @@
 
 /**
- * VM-exit handler for exceptions or NMIs (VMX_EXIT_XCPT_OR_NMI).
+ * VM-exit handler for exceptions or NMIs (VMX_EXIT_XCPT_OR_NMI). Conditional
+ * VM-exit.
  */
 HMVMX_EXIT_DECL hmR0VmxExitXcptOrNmi(PVMCPU pVCpu, PVMXTRANSIENT pVmxTransient)
@@ -15778 +15784 @@
 /* -=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= */
 
+/**
+ * Nested-guest VM-exit handler for exceptions or NMIs (VMX_EXIT_XCPT_OR_NMI).
+ * Conditional VM-exit.
+ */
+HMVMX_EXIT_DECL hmR0VmxExitXcptOrNmiNested(PVMCPU pVCpu, PVMXTRANSIENT pVmxTransient)
+{
+    HMVMX_VALIDATE_NESTED_EXIT_HANDLER_PARAMS(pVCpu, pVmxTransient);
+
+    int rc = hmR0VmxReadExitIntInfoVmcs(pVmxTransient);
+    AssertRCReturn(rc, rc);
+
+    Assert(VMX_EXIT_INT_INFO_IS_VALID(pVmxTransient->uExitIntInfo));
+    uint32_t const uExtIntType = VMX_EXIT_INT_INFO_TYPE(pVmxTransient->uExitIntInfo);
+
+    switch (uExtIntType)
+    {
+        /*
+         * We shouldn't direct host physical NMIs to the nested-guest.
+         */
+        case VMX_EXIT_INT_INFO_TYPE_NMI:
+            return hmR0VmxExitHostNmi(pVCpu);
+
+        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;
+            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);
+            }
+
+            /* Consult the exception bitmap for all other hardware exceptions. */
+            Assert(uVector <= X86_XCPT_LAST);
+            if (fXcptBitmap & RT_BIT(uVector))
+                fIntercept = true;
+#endif
+            break;
+        }
+
+        /*
+         * This should only happen when "acknowledge external interrupts on VM-exit" is set.
+         * We don't set it when executing guests or nested-guests.
+         */
+        case VMX_EXIT_INT_INFO_TYPE_EXT_INT:
+            RT_FALL_THRU();
+        default:
+        {
+            pVCpu->hm.s.u32HMError = pVmxTransient->uExitIntInfo;
+            return VERR_VMX_UNEXPECTED_INTERRUPTION_EXIT_TYPE;
+        }
+    }
+
+    return VERR_NOT_IMPLEMENTED;
+}
+
 
 /**