Changeset 13198 in vbox

Timestamp:

Oct 13, 2008 9:05:42 AM (16 years ago)

Author:

vboxsync

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

37740

Message:

Recommitted 37737 & 37738 minus the dangerous changes.

Location:

trunk

Files:

• include/VBox/cpum.h (modified) (1 diff)
• include/VBox/pgm.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAll.cpp (modified) (1 diff)
• 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 */
-static void VMXR0SetupTLBEPT(PVM pVM);
-static void VMXR0SetupTLBVPID(PVM pVM);
-static void VMXR0SetupTLBDummy(PVM pVM);
-static void VMXR0FlushEPT(PVM pVM, VMX_FLUSH enmFlush, RTGCPHYS GCPhys);
-static void VMXR0FlushVPID(PVM pVM, VMX_FLUSH enmFlush, RTGCPTR GCPtr);
+static void vmxR0SetupTLBEPT(PVM pVM);
+static void vmxR0SetupTLBVPID(PVM pVM);
+static void vmxR0SetupTLBDummy(PVM pVM);
+static void vmxR0FlushEPT(PVM pVM, VMX_FLUSH enmFlush, RTGCPHYS GCPhys);
+static void vmxR0FlushVPID(PVM pVM, VMX_FLUSH enmFlush, RTGCPTR GCPtr);
 
 
@@ -476 +476 @@
     if (pVM->hwaccm.s.fNestedPaging)
     {
-        pVM->hwaccm.s.vmx.pfnSetupTaggedTLB = VMXR0SetupTLBEPT;
+        pVM->hwaccm.s.vmx.pfnSetupTaggedTLB = vmxR0SetupTLBEPT;
 
         /* Default values for flushing. */
@@ -496 +496 @@
     if (pVM->hwaccm.s.vmx.fVPID)
     {
-        pVM->hwaccm.s.vmx.pfnSetupTaggedTLB = VMXR0SetupTLBVPID;
+        pVM->hwaccm.s.vmx.pfnSetupTaggedTLB = vmxR0SetupTLBVPID;
 
         /* Default values for flushing. */
@@ -514 +514 @@
 #endif /* HWACCM_VTX_WITH_VPID */
     else
-        pVM->hwaccm.s.vmx.pfnSetupTaggedTLB = VMXR0SetupTLBDummy;
+        pVM->hwaccm.s.vmx.pfnSetupTaggedTLB = vmxR0SetupTLBDummy;
 
 
@@ -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.
  */
-static void VMXR0SetupTLBDummy(PVM pVM)
+static void vmxR0SetupTLBDummy(PVM pVM)
 {
     return;
@@ -1527 +1551 @@
  * @param   pVM         The VM to operate on.
  */
-static void VMXR0SetupTLBEPT(PVM pVM)
+static void vmxR0SetupTLBEPT(PVM pVM)
 {
     PHWACCM_CPUINFO pCpu;
@@ -1552 +1576 @@
 
     if (pVM->hwaccm.s.fForceTLBFlush)
-        VMXR0FlushEPT(pVM, pVM->hwaccm.s.vmx.enmFlushContext, 0);
+        vmxR0FlushEPT(pVM, pVM->hwaccm.s.vmx.enmFlushContext, 0);
 
 #ifdef VBOX_WITH_STATISTICS
@@ -1569 +1593 @@
  * @param   pVM         The VM to operate on.
  */
-static void VMXR0SetupTLBVPID(PVM pVM)
+static void vmxR0SetupTLBVPID(PVM pVM)
 {
     PHWACCM_CPUINFO pCpu;
@@ -1626 +1650 @@
 
     if (pVM->hwaccm.s.fForceTLBFlush)
-        VMXR0FlushVPID(pVM, pVM->hwaccm.s.vmx.enmFlushContext, 0);
+        vmxR0FlushVPID(pVM, pVM->hwaccm.s.vmx.enmFlushContext, 0);
 
 #ifdef VBOX_WITH_STATISTICS
@@ -2986 +3010 @@
  * @param   GCPhys      Physical address of the page to flush
  */
-static void VMXR0FlushEPT(PVM pVM, VMX_FLUSH enmFlush, RTGCPHYS GCPhys)
+static void vmxR0FlushEPT(PVM pVM, VMX_FLUSH enmFlush, RTGCPHYS GCPhys)
 {
     uint64_t descriptor[2];
 
-    LogFlow(("VMXR0FlushEPT %d %VGv\n", enmFlush, GCPhys));
+    LogFlow(("vmxR0FlushEPT %d %VGv\n", enmFlush, GCPhys));
     Assert(pVM->hwaccm.s.fNestedPaging);
     descriptor[0] = pVM->hwaccm.s.vmx.GCPhysEPTP;
@@ -3007 +3031 @@
  * @param   GCPtr       Virtual address of the page to flush
  */
-static void VMXR0FlushVPID(PVM pVM, VMX_FLUSH enmFlush, RTGCPTR GCPtr)
+static void vmxR0FlushVPID(PVM pVM, VMX_FLUSH enmFlush, RTGCPTR GCPtr)
 {
     uint64_t descriptor[2];
@@ -3037 +3061 @@
     if (   !fFlushPending 
         && pVM->hwaccm.s.vmx.fVPID)
-        VMXR0FlushVPID(pVM, pVM->hwaccm.s.vmx.enmFlushPage, GCVirt);
+        vmxR0FlushVPID(pVM, pVM->hwaccm.s.vmx.enmFlushPage, GCVirt);
 #endif /* HWACCM_VTX_WITH_VPID */
 
@@ -3060 +3084 @@
     /* Skip it if a TLB flush is already pending. */
     if (!fFlushPending)
-        VMXR0FlushEPT(pVM, pVM->hwaccm.s.vmx.enmFlushPage, GCPhys);
+        vmxR0FlushEPT(pVM, pVM->hwaccm.s.vmx.enmFlushPage, GCPhys);
 
     return VINF_SUCCESS;