Changeset 36196 in vbox

Timestamp:

Mar 7, 2011 5:50:27 PM (14 years ago)

Author:

vboxsync

Message:

VMM: don't die hard during PDPTR preloading (VT-x), try guru meditate instead.

Location:

trunk

Files:

• include/VBox/vmm/pgm.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/pgm.h

@@ -330 +330 @@
 VMMDECL(int)        PGMGstSetPage(PVMCPU pVCpu, RTGCPTR GCPtr, size_t cb, uint64_t fFlags);
 VMMDECL(int)        PGMGstModifyPage(PVMCPU pVCpu, RTGCPTR GCPtr, size_t cb, uint64_t fFlags, uint64_t fMask);
-VMMDECL(X86PDPE)    PGMGstGetPaePDPtr(PVMCPU pVCpu, unsigned iPdPt);
+VMMDECL(int)        PGMGstQueryPaePDPtr(PVMCPU pVCpu, unsigned iPdpt, PX86PDPE pPdpe);
 
 VMMDECL(int)        PGMInvalidatePage(PVMCPU pVCpu, RTGCPTR GCPtrPage);

trunk/src/VBox/VMM/VMMAll/PGMAll.cpp

@@ -1627 +1627 @@
  * @param   iPdpt       PDPT index
  */
-VMMDECL(X86PDPE) PGMGstGetPaePDPtr(PVMCPU pVCpu, unsigned iPdpt)
+VMMDECL(int)  PGMGstQueryPaePDPtr(PVMCPU pVCpu, unsigned iPdpt, PX86PDPE pPdpe)
 {
     Assert(iPdpt <= 3);
-    return pgmGstGetPaePDPTPtr(pVCpu)->a[iPdpt & 3];
+    PX86PDPT pPdpt;
+    int rc = pgmGstGetPaePDPTPtrEx(pVCpu, &pPdpt);
+    if (RT_SUCCESS(rc))
+        *pPdpe = pPdpt->a[iPdpt & 3];
+    return rc;
 }
 

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

@@ -1237 +1237 @@
  * Prefetch the 4 PDPT pointers (PAE and nested paging only)
  *
+ * @returns VINF_SUCCESS or fatal error.
  * @param   pVM         The VM to operate on.
  * @param   pVCpu       The VMCPU to operate on.
  * @param   pCtx        Guest context
  */
-static void vmxR0PrefetchPAEPdptrs(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
+static int vmxR0PrefetchPAEPdptrs(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
 {
     if (CPUMIsGuestInPAEModeEx(pCtx))
     {
-        X86PDPE Pdpe;
-
         for (unsigned i=0;i<4;i++)
         {
-            Pdpe = PGMGstGetPaePDPtr(pVCpu, i);
-            int rc = VMXWriteVMCS64(VMX_VMCS_GUEST_PDPTR0_FULL + i*2, Pdpe.u);
+            X86PDPE Pdpe;
+            int rc = PGMGstQueryPaePDPtr(pVCpu, i, &Pdpe);
+            AssertRCReturn(rc, rc);
+
+            rc = VMXWriteVMCS64(VMX_VMCS_GUEST_PDPTR0_FULL + i*2, Pdpe.u);
             AssertRC(rc);
         }
     }
+    return VINF_SUCCESS;
 }
 
@@ -1747 +1750 @@
                 val = pCtx->cr3;
                 /* Prefetch the four PDPT entries in PAE mode. */
-                vmxR0PrefetchPAEPdptrs(pVM, pVCpu, pCtx);
+                rc = vmxR0PrefetchPAEPdptrs(pVM, pVCpu, pCtx);
+                AssertRCReturn(rc, rc);
             }
         }
@@ -2021 +2025 @@
         }
         /* Prefetch the four PDPT entries in PAE mode. */
-        vmxR0PrefetchPAEPdptrs(pVM, pVCpu, pCtx);
+        rc = vmxR0PrefetchPAEPdptrs(pVM, pVCpu, pCtx);
+        AssertRCReturn(rc, rc);
     }