Changeset 13198

Timestamp:

10/13/08 11:05:42 (3 months ago)

Author:

vboxsync

Message:

Recommitted 37737 & 37738 minus the dangerous changes.

Files:

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

trunk/include/VBox/cpum.h

@@ -806 +806 @@
-}
-
+/**
+ * Tests if the guest is running in PAE mode or not.
+ *
+ * @returns true if in PAE mode, otherwise false.
+ * @param   pCtx    Current CPU context
+ */
+DECLINLINE(bool) CPUMIsGuestInPAEModeEx(PCPUMCTX pCtx)
+{
+    return (    CPUMIsGuestInPagedProtectedModeEx(pCtx)
+            &&  (pCtx->cr4 & X86_CR4_PAE)
+            &&  !CPUMIsGuestInLongModeEx(pCtx));
+}
+
-/** @} */
-

trunk/include/VBox/pgm.h

@@ -336 +336 @@
-VMMDECL(int)    PGMGstSetPage(PVM pVM, RTGCPTR GCPtr, size_t cb, uint64_t fFlags);
-VMMDECL(int)    PGMGstModifyPage(PVM pVM, RTGCPTR GCPtr, size_t cb, uint64_t fFlags, uint64_t fMask);
+VMMDECL(X86PDPE) PGMGstGetPaePDPtr(PVM pVM, unsigned iPdPt);
+
-VMMDECL(int)    PGMFlushTLB(PVM pVM, uint64_t cr3, bool fGlobal);
-VMMDECL(int)    PGMUpdateCR3(PVM pVM, uint64_t cr3);

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

@@ -1211 +1211 @@
-}
-
+/**
+ * Gets the specified page directory pointer table entry.
+ *
+ * @returns PDP entry
+ * @param   pPGM        Pointer to the PGM instance data.
+ * @param   iPdpt       PDPT index
+ */
+VMMDECL(X86PDPE) PGMGstGetPaePDPtr(PVM pVM, unsigned iPdpt)
+{
+    Assert(iPdpt <= 3);
+    return pVM->pgm.s.CTXSUFF(pGstPaePDPT)->a[iPdpt & 3];
+}
+
-
-/**

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

@@ -56 +56 @@
-#define VMXR0ReportWorldSwitchError(a, b, c)      do { } while (0);
-#endif /* VBOX_STRICT */
-VMX
-VMX
-VMX
-VMX
-VMX
+vmx
+vmx
+vmx
+vmx
+vmx
-
-
@@ -476 +476 @@
-    if (pVM->hwaccm.s.fNestedPaging)
-    {
-VMX
+vmx
-
-        /* Default values for flushing. */
@@ -496 +496 @@
-    if (pVM->hwaccm.s.vmx.fVPID)
-    {
-VMX
+vmx
-
-        /* Default values for flushing. */
@@ -514 +514 @@
-#endif /* HWACCM_VTX_WITH_VPID */
-    else
-VMX
+vmx
-
-
@@ -818 +818 @@
-}
-
+/**
+ * Prefetch the 4 PDPT pointers (PAE and nested paging only)
+ *
+ * @param   pVM         The VM to operate on.
+ * @param   pCtx        Guest context
+ */ 
+static void vmxR0PrefetchPAEPdptrs(PVM pVM, PCPUMCTX pCtx)
+{
+    if (CPUMIsGuestInPAEModeEx(pCtx))
+    {
+        X86PDPE Pdpe;
+
+        for (unsigned i=0;i<4;i++)
+        {
+            Pdpe = PGMGstGetPaePDPtr(pVM, i);
+            int rc = VMXWriteVMCS64(VMX_VMCS_GUEST_PDPTR0_FULL + i*2, Pdpe.u);
+            AssertRC(rc);
+        }
+    }
+}
-
-/**
@@ -1226 +1246 @@
-                /* Save the real guest CR3 in VMX_VMCS_GUEST_CR3 */
-                val = pCtx->cr3;
+                /* Prefetch the four PDPT entries in PAE mode. */
+                vmxR0PrefetchPAEPdptrs(pVM, pCtx);
-            }
-        }
@@ -1454 +1476 @@
-            PGMUpdateCR3(pVM, val);
-        }
+        /* Prefetch the four PDPT entries in PAE mode. */
+        vmxR0PrefetchPAEPdptrs(pVM, pCtx);
-    }
-
@@ -1516 +1540 @@
- * @param   pVM         The VM to operate on.
- */
-VMX
+vmx
-{
-    return;
@@ -1527 +1551 @@
- * @param   pVM         The VM to operate on.
- */
-VMX
+vmx
-{
-    PHWACCM_CPUINFO pCpu;
@@ -1552 +1576 @@
-
-    if (pVM->hwaccm.s.fForceTLBFlush)
-VMX
+vmx
-
-#ifdef VBOX_WITH_STATISTICS
@@ -1569 +1593 @@
- * @param   pVM         The VM to operate on.
- */
-VMX
+vmx
-{
-    PHWACCM_CPUINFO pCpu;
@@ -1626 +1650 @@
-
-    if (pVM->hwaccm.s.fForceTLBFlush)
-VMX
+vmx
-
-#ifdef VBOX_WITH_STATISTICS
@@ -2986 +3010 @@
- * @param   GCPhys      Physical address of the page to flush
- */
-VMX
+vmx
-{
-    uint64_t descriptor[2];
-
-VMX
+vmx
-    Assert(pVM->hwaccm.s.fNestedPaging);
-    descriptor[0] = pVM->hwaccm.s.vmx.GCPhysEPTP;
@@ -3007 +3031 @@
- * @param   GCPtr       Virtual address of the page to flush
- */
-VMX
+vmx
-{
-    uint64_t descriptor[2];
@@ -3037 +3061 @@
-    if (   !fFlushPending 
-        && pVM->hwaccm.s.vmx.fVPID)
-VMX
+vmx
-#endif /* HWACCM_VTX_WITH_VPID */
-
@@ -3060 +3084 @@
-    /* Skip it if a TLB flush is already pending. */
-    if (!fFlushPending)
-VMX
+vmx
-
-    return VINF_SUCCESS;