Changeset 27293 in vbox for trunk/src

Timestamp:

Mar 11, 2010 4:50:01 PM (15 years ago)

Author:

vboxsync

Message:

Runtime/alloc-ef: more filling and more checking

Location:

trunk/src/VBox/Runtime/r3

Files:

• alloc-ef.cpp (modified) (4 diffs)
• alloc-ef.h (modified) (4 diffs)

trunk/src/VBox/Runtime/r3/alloc-ef.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -293 +293 @@
     }
 
+    /** @todo this alignment decreases fence accuracy, but there are lots
+     * of places in VirtualBox which assumes that the allocation is aligned
+     * properly even for totally unusual allocation sizes, otherwise assertions
+     * are triggered, which ensure a particular alignment of elements. */
+    cb = RT_ALIGN_Z(cb, ARCH_BITS / 8);
+
 #ifdef RTALLOC_EFENCE_TRACE
     /*
@@ -319 +325 @@
         void *pvEFence = pvBlock;
         void *pv = (char *)pvEFence + RTALLOC_EFENCE_SIZE;
+#ifdef RTALLOC_EFENCE_NOMAN_FILLER
+        memset((char *)pv + cb, RTALLOC_EFENCE_NOMAN_FILLER, PAGE_SIZE - cb % PAGE_SIZE);
+#endif
         #else
         void *pvEFence = (char *)pvBlock + (cbBlock - RTALLOC_EFENCE_SIZE);
         void *pv = (char *)pvEFence - cb;
+#ifdef RTALLOC_EFENCE_NOMAN_FILLER
+        memset(pvBlock, RTALLOC_EFENCE_NOMAN_FILLER, cbBlock - RTALLOC_EFENCE_SIZE - cb);
+#endif
         #endif
+
+#ifdef RTALLOC_EFENCE_FENCE_FILLER
+        memset(pvEFence, RTALLOC_EFENCE_FENCE_FILLER, RTALLOC_EFENCE_SIZE);
+#endif
         int rc = RTMemProtect(pvEFence, RTALLOC_EFENCE_SIZE, RTMEM_PROT_NONE);
         if (!rc)
@@ -379 +395 @@
         if (gfRTMemFreeLog)
             RTLogPrintf("RTMem %s: pv=%p pvCaller=%p cb=%#x\n", pszOp, pv, pvCaller, pBlock->cb);
+
+#ifdef RTALLOC_EFENCE_NOMAN_FILLER
+        /*
+         * Check whether the no man's land is untouched.
+         */
+# ifdef RTALLOC_EFENCE_IN_FRONT
+        void *pvNoMan = (char *)pv + pBlock->cb;
+# else
+        void *pvNoMan = (void *)((uintptr_t)pv & ~PAGE_OFFSET_MASK);
+# endif
+        void *p = ASMMemIsAll8(pvNoMan,
+                               RT_ALIGN_Z(pBlock->cb, PAGE_SIZE) - pBlock->cb,
+                               RTALLOC_EFENCE_NOMAN_FILLER);
+        if (p)
+            RTAssertDoPanic();
+#endif
 
     #ifdef RTALLOC_EFENCE_FREE_FILL

trunk/src/VBox/Runtime/r3/alloc-ef.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -45 +45 @@
  * RTMemAllocZ(), RTMemRealloc(), RTMemTmpAlloc() and RTMemTmpAllocZ().
  */
-#if 0// defined(DEBUG_bird)
+#if 1
 # define RTALLOC_USE_EFENCE
 #endif
@@ -81 +81 @@
  * Requires RTALLOC_EFENCE_TRACE.
  */
-#if defined(RT_OS_LINUX)
+#if defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS)
 # define RTALLOC_EFENCE_FREE_FILL       'f'
 #endif
@@ -90 +90 @@
  */
 #define RTALLOC_EFENCE_FILLER           0xef
+
+/** @def RTALLOC_EFENCE_NOMAN_FILLER
+ * This define will enable memset(,RTALLOC_EFENCE_NOMAN_FILLER,)'ing the
+ * unprotected but not allocated area of memory, the so called no man's land.
+ */
+#define RTALLOC_EFENCE_NOMAN_FILLER           0xaa
+
+/** @def RTALLOC_EFENCE_FENCE_FILLER
+ * This define will enable memset(,RTALLOC_EFENCE_FENCE_FILLER,)'ing the
+ * fence itself, as debuggers can usually read them.
+ */
+#define RTALLOC_EFENCE_FENCE_FILLER           0xcc
 
 #if defined(DOXYGEN_RUNNING)