Changeset 17547 in vbox

Timestamp:

Mar 9, 2009 2:48:02 AM (16 years ago)

Author:

vboxsync

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

43983

Message:

GMM: executed the GMM_GCPHYS_LAST todo, fixed GMM_GCPHYS_UNSHAREABLE, and make sure the RAM isn't above GMM_GCPHYS_LAST.

Location:

trunk

Files:

• include/VBox/gmm.h (modified) (2 diffs)
• src/VBox/VMM/MM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/GMMR0.cpp (modified) (2 diffs)

trunk/include/VBox/gmm.h

@@ -108 +108 @@
 
 
+/** @def GMM_GCPHYS_LAST
+ * The last of the valid guest physical address as it applies to GMM pages.
+ *
+ * This must reflect the constraints imposed by the RTGCPHYS type and
+ * the guest page frame number used internally in GMMPAGE.
+ *
+ * @note    Note this corresponds to GMM_PAGE_PFN_LAST. */
+#if HC_ARCH_BITS == 64
+# define GMM_GCPHYS_LAST            UINT64_C(0x00000fffffff0000)    /* 2^44 (16TB) - 0x10000 */
+#else
+# define GMM_GCPHYS_LAST            UINT64_C(0x0000000fffff0000)    /* 2^36 (64GB) - 0x10000 */
+#endif
+
 /**
  * Over-commitment policy.
@@ -241 +254 @@
 typedef GMMPAGEDESC *PGMMPAGEDESC;
 
-/** GMMPAGEDESC::HCPhysGCPhys value that indicates that the page is shared. */
-#define GMM_GCPHYS_UNSHAREABLE  (RTHCPHYS)(0xfffffff0)
+/** GMMPAGEDESC::HCPhysGCPhys value that indicates that the page is unsharable.
+ * @note    This corresponds to GMM_PAGE_PFN_UNSHAREABLE. */
+#if HC_ARCH_BITS == 64
+# define GMM_GCPHYS_UNSHAREABLE     UINT64_C(0x00000fffffff1000)
+#else
+# define GMM_GCPHYS_UNSHAREABLE     UINT64_C(0x0000000fffff1000)
+#endif
 
 GMMR0DECL(int)  GMMR0Init(void);

trunk/src/VBox/VMM/MM.cpp

@@ -313 +313 @@
     else
         AssertMsgRCReturn(rc, ("Configuration error: Failed to query integer \"RamSize\", rc=%Rrc.\n", rc), rc);
-    AssertLogRelMsg(!(cbRam & ~X86_PTE_PAE_PG_MASK), ("%RGp\n", cbRam));
+    AssertLogRelMsg(!(cbRam & ~X86_PTE_PAE_PG_MASK), ("%RGp X86_PTE_PAE_PG_MASK=%RX64\n", cbRam, X86_PTE_PAE_PG_MASK));
+    AssertLogRelMsgReturn(cbRam <= GMM_GCPHYS_LAST, ("cbRam=%RGp GMM_GCPHYS_LAST=%RX64\n", cbRam, GMM_GCPHYS_LAST), VERR_OUT_OF_RANGE);
     cbRam &= X86_PTE_PAE_PG_MASK;
     pVM->mm.s.cbRamBase = cbRam;

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

@@ -327 +327 @@
 #define GMM_PAGE_IS_FREE(pPage)     ( (pPage)->Common.u2State == GMM_PAGE_STATE_FREE )
 
-/** @def GMM_PAGE_PFN_END
- * The end of the valid guest pfn range, {0..GMM_PAGE_PFN_END-1}.
- * @remark Some of the values outside the range has special meaning, see related \#defines.
+/** @def GMM_PAGE_PFN_LAST
+ * The last valid guest pfn range.
+ * @remark Some of the values outside the range has special meaning,
+ *         see GMM_PAGE_PFN_UNSHAREABLE.
  */
 #if HC_ARCH_BITS == 64
-# define GMM_PAGE_PFN_END           UINT32_C(0xfffffff0)
+# define GMM_PAGE_PFN_LAST           UINT32_C(0xfffffff0)
 #else
-# define GMM_PAGE_PFN_END           UINT32_C(0x00fffff0)
+# define GMM_PAGE_PFN_LAST           UINT32_C(0x00fffff0)
 #endif
+AssertCompile(GMM_PAGE_PFN_LAST        == (GMM_GCPHYS_LAST >> PAGE_SHIFT));
 
 /** @def GMM_PAGE_PFN_UNSHAREABLE
@@ -345 +347 @@
 # define GMM_PAGE_PFN_UNSHAREABLE   UINT32_C(0x00fffff1)
 #endif
-
-/** @def GMM_GCPHYS_LAST
- * The last of the valid guest physical address as it applies to GMM pages.
- *
- * This must reflect the constraints imposed by the RTGCPHYS type and
- * the guest page frame number used internally in GMMPAGE. */
-#if 1
-# define GMM_GCPHYS_LAST            UINT32_C(0xfffff000)            /* 2^32 (4GB)  - 0x1000 */
-#else /** @todo enable this after changing NIL_RTHCPHYS to ~(RTHCPHYS)0! */
-#if HC_ARCH_BITS == 64
-# define GMM_GCPHYS_LAST            UINT64_C(0x00000fffffff0000)    /* 2^44 (16TB) - 0x10000 */
-#else
-# define GMM_GCPHYS_LAST            UINT64_C(0x0000000fffff0000)    /* 2^36 (64GB) - 0x10000 */
-#endif
-#endif
+AssertCompile(GMM_PAGE_PFN_UNSHAREABLE == (GMM_GCPHYS_UNSHAREABLE >> PAGE_SHIFT));