Changeset 96962 in vbox for trunk/src/VBox

Timestamp:

Oct 2, 2022 9:54:28 PM (2 years ago)

Author:

vboxsync

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

153881

Message:

VMM/HMVMX: Preliminary fix for the nested nested paging issue we've been having with DSL booting getting stuck. Logging. bugref:10092

File:

• trunk/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h (modified) (7 diffs)

trunk/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h

@@ -3046 +3046 @@
  */
 DECLINLINE(void) vmxHCSetPendingEvent(PVMCPUCC pVCpu, uint32_t u32IntInfo, uint32_t cbInstr, uint32_t u32ErrCode,
-                                        RTGCUINTPTR GCPtrFaultAddress)
+                                      RTGCUINTPTR GCPtrFaultAddress)
 {
     Assert(!VCPU_2_VMXSTATE(pVCpu).Event.fPending);
@@ -3906 +3906 @@
         STAM_COUNTER_INC(&VCPU_2_VMXSTATS(pVCpu).StatSwitchHmToR3FF);
         int rc = RT_LIKELY(!VM_FF_IS_SET(pVM, VM_FF_PGM_NO_MEMORY)) ? VINF_EM_RAW_TO_R3 : VINF_EM_NO_MEMORY;
-        Log4Func(("HM_TO_R3 forcing us back to ring-3. rc=%d\n", rc));
+        Log4Func(("HM_TO_R3 forcing us back to ring-3. rc=%d (fVM=%#RX64 fCpu=%#RX64)\n",
+                  rc, pVM->fGlobalForcedActions, pVCpu->fLocalForcedActions));
         return rc;
     }
@@ -10217 +10218 @@
     HMVMX_VALIDATE_NESTED_EXIT_HANDLER_PARAMS(pVCpu, pVmxTransient);
 
-#ifdef VBOX_STRICT
+# ifdef VBOX_STRICT
     PCCPUMCTX pCtx = &pVCpu->cpum.GstCtx;
     switch (pVmxTransient->uExitReason)
@@ -10250 +10251 @@
             break;
     }
-#endif
+# endif
 
     vmxHCReadExitInstrLenVmcs(pVCpu, pVmxTransient);
@@ -10265 +10266 @@
 }
 
-
 # ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
+
 /**
  * Nested-guest VM-exit handler for EPT violation (VMX_EXIT_EPT_VIOLATION).
@@ -10309 +10310 @@
                                                                      GCPhysNestedFault, fIsLinearAddrValid, GCPtrNestedFault,
                                                                      &Walk);
+        Log7Func(("PGM (uExitQual=%#RX64, %RGp, %RGv) -> %Rrc (fFailed=%d)\n",
+                  uExitQual, GCPhysNestedFault, GCPtrNestedFault, VBOXSTRICTRC_VAL(rcStrict), Walk.fFailed));
         if (RT_SUCCESS(rcStrict))
+        {
+#if 1
+            /*
+             * If it's our VMEXIT, we're responsible for re-injecting any event which delivery
+             * might have triggered this VMEXIT.  If we forward the problem to the inner VMM,
+             * it's its problem to deal with that issue.  This means that it's troublesome to
+             * call vmxHCCheckExitDueToEventDelivery before PGMR0NestedTrap0eHandlerNestedPaging
+             * have decided who's VMEXIT it is. Unfortunately, we're a bit of a pickle then if
+             * we end up with an informational status here, as we _must_ _not_ drop events either.
+             */
+            /** @todo need better solution for this.  Better solution should probably be
+             *        applied to other exits too...   */
+            if (rcStrict == VINF_SUCCESS)
+            {
+                vmxHCReadExitIntInfoVmcs(pVCpu, pVmxTransient);
+                vmxHCReadExitIntErrorCodeVmcs(pVCpu, pVmxTransient);
+                vmxHCReadExitInstrLenVmcs(pVCpu, pVmxTransient);
+                vmxHCReadIdtVectoringInfoVmcs(pVCpu, pVmxTransient);
+                vmxHCReadIdtVectoringErrorCodeVmcs(pVCpu, pVmxTransient);
+
+                vmxHCCheckExitDueToEventDelivery(pVCpu, pVmxTransient);
+            }
+#endif
             return rcStrict;
+        }
 
         vmxHCReadExitInstrLenVmcs(pVCpu, pVmxTransient);
@@ -10384 +10411 @@
     return vmxHCExitEptMisconfig(pVCpu, pVmxTransient);
 }
+
 # endif /* VBOX_WITH_NESTED_HWVIRT_VMX_EPT */