Changeset 26685 in vbox for trunk

Timestamp:

Feb 22, 2010 5:48:23 PM (15 years ago)

Author:

vboxsync

Message:

Large page changes

Location:

trunk

Files:

• include/VBox/pgm.h (modified) (2 diffs)
• include/VBox/vm.h (modified) (1 diff)
• src/VBox/VMM/HWACCM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/HWACCMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAllPhys.cpp (modified) (3 diffs)

trunk/include/VBox/pgm.h

@@ -283 +283 @@
     (    (enmProt) == PGMROMPROT_READ_ROM_WRITE_IGNORE \
       || (enmProt) == PGMROMPROT_READ_ROM_WRITE_RAM )
+
+
 
 VMMDECL(bool)       PGMIsLocked(PVM pVM);
@@ -405 +407 @@
 
 
+VMMDECL(void) PGMSetLargePageUsage(PVM pVM, bool fUseLargePages);
+
+/**
+ * Query large page usage state
+ *
+ * @returns 0 - disabled, 1 - enabled
+ * @param   pVM         The VM to operate on.
+ */
+#define PGMIsUsingLargePages(pVM) (pVM->fUseLargePages)
+
+
 #ifdef IN_RC
 /** @defgroup grp_pgm_gc  The PGM Guest Context API

trunk/include/VBox/vm.h

@@ -784 +784 @@
     /** PARAV enabled flag. */
     bool                        fPARAVEnabled;
+    /** Large page enabled flag. */
+    bool                        fUseLargePages;
     /** @} */
 

trunk/src/VBox/VMM/HWACCM.cpp

@@ -1157 +1157 @@
                     if (pVM->hwaccm.s.vmx.fUnrestrictedGuest)
                         LogRel(("HWACCM: Unrestricted guest execution enabled!\n"));
+
+#ifdef DEBUG_sandervl
+                    /* Use large (2 MB) pages for our EPT PDEs where possible. */
+                    PGMSetLargePageUsage(pVM, true);
+#endif
                 }
                 else

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

@@ -338 +338 @@
     return !!pVCpu->hwaccm.s.Event.fPending;
 }
-

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

@@ -2108 +2108 @@
 
 /**
+ * Enable or disable large page usage
+ *
+ * @param   pVM             The VM to operate on.
+ * @param   fUseLargePages  Use/not use large pages
+ */
+VMMDECL(void) PGMSetLargePageUsage(PVM pVM, bool fUseLargePages)
+{
+      pVM->fUseLargePages = fUseLargePages;
+}
+
+/**
  * Acquire the PGM lock.
  *

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

@@ -2937 +2937 @@
     Assert(!PdeDst.n.u1Present); /* We're only supposed to call SyncPT on PDE!P and conflicts.*/
 
-# if (PGM_SHW_TYPE == PGM_TYPE_EPT) && (HC_ARCH_BITS == 64) && defined(RT_OS_WINDOWS) && defined(DEBUG_sandervl)
+# if (PGM_SHW_TYPE == PGM_TYPE_EPT) && (HC_ARCH_BITS == 64) && defined(RT_OS_WINDOWS)
+    if (PGMIsUsingLargePages(pVM))
     {
         RTHCPHYS HCPhys;
         rc = pgmPhysAllocLargePage(pVM, GCPtrPage & SHW_PDE_PG_MASK, &HCPhys);
         if (RT_SUCCESS(rc))
-        {   
+        {
             PdeDst.u &= X86_PDE_AVL_MASK;
             PdeDst.u |= HCPhys;

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

@@ -368 +368 @@
     Assert(!PGM_PAGE_IS_MMIO(pPage));
 
+    if (PGMIsUsingLargePages(pVM))
+    {
+        RTHCPHYS HCPhysDummy;
+
+        int rc = pgmPhysAllocLargePage(pVM, GCPhys, &HCPhysDummy);
+        if (rc == VINF_SUCCESS)
+            return rc;
+
+        /* fall back to 4kb pages. */
+    }
 
     /*
@@ -471 +481 @@
      */
     Assert(PGMIsLocked(pVM));
+    Assert(PGMIsUsingLargePages(pVM));
     Assert((GCPhys & X86_PD_PAE_MASK) == 0);
     AssertPtr(pHCPhys);
@@ -540 +551 @@
                 }
                 LogFlow(("pgmPhysAllocLargePage failed with %Rrc\n", rc));
+
+                /* If we fail once, it most likely means the host's memory is too fragmented; don't bother trying again. */
+                PGMSetLargePageUsage(pVM, false);
                 return rc;
             }