Changeset 38707 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Sep 9, 2011 2:10:18 PM (13 years ago)

Author:

vboxsync

Message:

VMM/VT-x: Fix for PAE guests running on 32-bit hosts or 64-bit hosts where VBoxInternal/PGM/MaxRing3Chunks is used.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAll.cpp (modified) (1 diff)
• PGMAllBth.h (modified) (1 diff)

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

@@ -1624 +1624 @@
 #endif
 
-/**
- * Gets the specified page directory pointer table entry.
- *
- * @returns PDP entry
- * @param   pVCpu       VMCPU handle.
- * @param   iPdpt       PDPT index
- */
-VMMDECL(int)  PGMGstQueryPaePDPtr(PVMCPU pVCpu, unsigned iPdpt, PX86PDPE pPdpe)
-{
-    Assert(iPdpt <= 3);
-    PX86PDPT pPdpt;
-    int rc = pgmGstGetPaePDPTPtrEx(pVCpu, &pPdpt);
-    if (RT_SUCCESS(rc))
-        *pPdpe = pPdpt->a[iPdpt & 3];
-    return rc;
+
+/**
+ * Gets the PAE PDPEs values cached by the CPU.
+ *
+ * @returns VBox status code.
+ * @param   pVCpu               The virtual CPU.
+ * @param   paPdpes             Where to return the four PDPEs.  The array
+ *                              pointed to must have 4 entries.
+ */
+VMM_INT_DECL(int) PGMGstGetPaePdpes(PVMCPU pVCpu, PX86PDPE paPdpes)
+{
+    Assert(pVCpu->pgm.s.enmShadowMode == PGMMODE_EPT);
+
+    paPdpes[0] = pVCpu->pgm.s.aGstPaePdpeRegs[0];
+    paPdpes[1] = pVCpu->pgm.s.aGstPaePdpeRegs[1];
+    paPdpes[2] = pVCpu->pgm.s.aGstPaePdpeRegs[2];
+    paPdpes[3] = pVCpu->pgm.s.aGstPaePdpeRegs[3];
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Sets the PAE PDPEs values cached by the CPU.
+ *
+ * @remarks This must be called *AFTER* PGMUpdateCR3.
+ *
+ * @returns VBox status code.
+ * @param   pVCpu               The virtual CPU.
+ * @param   paPdpes             The four PDPE values.  The array pointed to
+ *                              must have exactly 4 entries.
+ */
+VMM_INT_DECL(int) PGMGstUpdatePaePdpes(PVMCPU pVCpu, PCX86PDPE paPdpes)
+{
+    Assert(pVCpu->pgm.s.enmShadowMode == PGMMODE_EPT);
+
+    for (unsigned i = 0; i < RT_ELEMENTS(pVCpu->pgm.s.aGstPaePdpeRegs); i++)
+    {
+        if (pVCpu->pgm.s.aGstPaePdpeRegs[i].u != paPdpes[i].u)
+        {
+            pVCpu->pgm.s.aGstPaePdpeRegs[i] = paPdpes[i];
+
+            /* Force lazy remapping if it changed in any way. */
+            pVCpu->pgm.s.apGstPaePDsR3[i]     = 0;
+#  ifndef VBOX_WITH_2X_4GB_ADDR_SPACE
+            pVCpu->pgm.s.apGstPaePDsR0[i]     = 0;
+#  endif
+            pVCpu->pgm.s.apGstPaePDsRC[i]     = 0;
+            pVCpu->pgm.s.aGCPhysGstPaePDs[i]  = NIL_RTGCPHYS;
+        }
+    }
+    return VINF_SUCCESS;
 }
 

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -4459 +4459 @@
             for (unsigned i = 0; i < X86_PG_PAE_PDPE_ENTRIES; i++, GCPtr += PAGE_SIZE)
             {
+                pVCpu->pgm.s.aGstPaePdpeRegs[i].u = pGuestPDPT->a[i].u;
                 if (pGuestPDPT->a[i].n.u1Present)
                 {