Changeset 79832 in vbox for trunk/src/VBox

Timestamp:

Jul 17, 2019 11:26:01 AM (5 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Check VMX_EXIT_CTLS_ACK_EXT_INT before causing an external interrupt VM-exit (with interrupts still pending). Logging and assertion nits.

File:

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

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

@@ -178 +178 @@
 #define HMVMX_LOG_EXIT(a_pVCpu, a_uExitReason) \
     do { \
-        Log4(("VM-exit: vcpu[%RU32] reason=%#x -v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v\n", \
-             (a_pVCpu)->idCpu, (a_uExitReason))); \
+        const char * const pszExit = HMGetVmxExitName((a_uExitReason)); \
+        Log4(("VM-exit: vcpu[%RU32] %85s -v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-\n", (a_pVCpu)->idCpu, pszExit)); \
     } while (0) \
 
@@ -2203 +2203 @@
             hmR0VmxSetMsrPermission(pVCpu, pVmcsInfo, fIsNstGstVmcs, idMsr, VMXMSRPM_ALLOW_RD_WR);
 
-        LogFlowFunc(("MSR added, cMsrs now %u\n", cMsrs));
+        Log4Func(("Added MSR %#RX32, cMsrs=%u\n", idMsr, cMsrs));
         fAdded = true;
     }
@@ -9360 +9360 @@
         {
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
-            if (   fIsNestedGuest
-                && CPUMIsGuestVmxPinCtlsSet(pVCpu, pCtx, VMX_PIN_CTLS_EXT_INT_EXIT))
+            if (    fIsNestedGuest
+                &&  CPUMIsGuestVmxPinCtlsSet(pVCpu, pCtx, VMX_PIN_CTLS_EXT_INT_EXIT)
+                && !CPUMIsGuestVmxExitCtlsSet(pVCpu, pCtx, VMX_EXIT_CTLS_ACK_EXT_INT))
             {
-                VBOXSTRICTRC rcStrict = IEMExecVmxVmexitExtInt(pVCpu, 0/* uVector */, true /* fIntPending */);
+                VBOXSTRICTRC rcStrict = IEMExecVmxVmexitExtInt(pVCpu, 0 /* uVector */, true /* fIntPending */);
                 if (rcStrict != VINF_VMX_INTERCEPT_NOT_ACTIVE)
                     return rcStrict;
@@ -14669 +14670 @@
 static VBOXSTRICTRC hmR0VmxExitXcpt(PVMCPU pVCpu, PVMXTRANSIENT pVmxTransient)
 {
+    HMVMX_ASSERT_READ(pVmxTransient, HMVMX_READ_XCPT_INFO);
+
     /*
      * If this VM-exit occurred while delivering an event through the guest IDT, take
@@ -16915 +16918 @@
                 ExitEventInfo.uIdtVectoringInfo    = pVmxTransient->uIdtVectoringInfo;
                 ExitEventInfo.uIdtVectoringErrCode = pVmxTransient->uIdtVectoringErrorCode;
+
+#ifdef DEBUG_ramshankar
+                hmR0VmxImportGuestState(pVCpu, pVmxTransient->pVmcsInfo, CPUMCTX_EXTRN_CS | CPUMCTX_EXTRN_RIP);
+                Log4Func(("cs:rip=%#04x:%#RX64 %s err_code=%#x exit_qual=%#RX64\n", pCtx->cs.Sel, pCtx->rip,
+                          VMX_EXIT_INT_INFO_IS_XCPT_PF(pVmxTransient->uExitIntInfo) ? "#PF" : "Unk",
+                          pVmxTransient->uExitIntErrorCode, pVmxTransient->uExitQual));
+                Log4Func(("idt_info=%#RX64 (%s) idt_errcode=%#RX32\n", pVmxTransient->uIdtVectoringInfo,
+                          VMX_IDT_VECTORING_INFO_IS_VALID(pVmxTransient->uIdtVectoringInfo) ? "Valid" : "Invalid",
+                          pVmxTransient->uIdtVectoringErrorCode));
+#endif
                 return IEMExecVmxVmexitXcpt(pVCpu, &ExitInfo, &ExitEventInfo);
             }