Changeset 53675 in vbox for trunk

Timestamp:

Jan 2, 2015 12:34:34 PM (10 years ago)

Author:

vboxsync

Message:

VBoxDTrace: vmem fix (r53)

Location:

trunk/src/VBox/ExtPacks/VBoxDTrace

Files:

• VBoxDTraceR0/VBoxDTraceR0.cpp (modified) (8 diffs)
• onnv/uts/common/dtrace/dtrace.c (modified) (2 diffs)

trunk/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0/VBoxDTraceR0.cpp

@@ -886 +886 @@
     /** The configured resource base. */
     uint32_t            uBase;
-    /** The configured resource end (base included). */
-    uint32_t            uEnd;
+    /** The configured max number of items. */
+    uint32_t            cMaxItems;
     /** The size of the apChunks array. */
     uint32_t            cMaxChunks;
@@ -910 +910 @@
      */
     AssertMsgReturn((uintptr_t)pvBase <= UINT32_MAX, ("%p\n", pvBase), NULL);
+    AssertMsgReturn(cb <= UINT32_MAX, ("%zu\n", cb), NULL);
     AssertMsgReturn((uintptr_t)pvBase + cb - 1 <= UINT32_MAX, ("%p %zu\n", pvBase, cb), NULL);
     AssertMsgReturn(cbUnit == 1, ("%zu\n", cbUnit), NULL);
@@ -922 +923 @@
      * Allocate the instance.
      */
-    uint32_t cChunks = (uint32_t)(cb - (uintptr_t)pvBase);
-    cChunks += VBOXDTVMEMCHUNK_BITS - 1;
-    cChunks /= VBOXDTVMEMCHUNK_BITS;
+    uint32_t cChunks = cb / VBOXDTVMEMCHUNK_BITS;
+    if (cb % VBOXDTVMEMCHUNK_BITS)
+        cChunks++;
     PVBOXDTVMEM pThis = (PVBOXDTVMEM)RTMemAllocZ(RT_OFFSETOF(VBOXDTVMEM, apChunks[cChunks]));
     if (!pThis)
@@ -938 +939 @@
     pThis->cCurChunks   = 0;
     pThis->uBase        = (uint32_t)(uintptr_t)pvBase;
-    pThis->uEnd         = (uint32_t)cb;
+    pThis->cMaxItems    = (uint32_t)cb;
     pThis->cMaxChunks   = cChunks;
 
@@ -1024 +1025 @@
         /* Out of resources? */
         if (cChunks >= pThis->cMaxChunks)
-        {
-SUPR0Printf("cChunks=%u cMaxChunks=%u!!\n", cChunks, pThis->cMaxChunks);
             break;
-        }
 
         /*
@@ -1034 +1032 @@
         uint32_t const  iFirstBit = cChunks > 0 ? pThis->apChunks[cChunks - 1]->iFirst + VBOXDTVMEMCHUNK_BITS : 0;
         uint32_t const  cFreeBits = cChunks + 1 == pThis->cMaxChunks
-                                  ? pThis->uEnd - pThis->uBase - iFirstBit
+                                  ? pThis->cMaxItems - (iFirstBit - pThis->uBase)
                                   : VBOXDTVMEMCHUNK_BITS;
         Assert(cFreeBits <= VBOXDTVMEMCHUNK_BITS);
@@ -1042 +1040 @@
         pChunk = (PVBOXDTVMEMCHUNK)RTMemAllocZ(sizeof(*pChunk));
         if (!pChunk)
-        {
-SUPR0Printf("returning NULL!!\n");
             return NULL;
-        }
 
 SUPR0Printf("Adding chunk %p at bit %u, covering %u bits\n", pChunk, iFirstBit, cFreeBits);
@@ -1099 +1094 @@
     uint32_t uMem = (uint32_t)(uintptr_t)pvMem;
     AssertReturnVoid(uMem >= pThis->uBase);
-    AssertReturnVoid(uMem < pThis->uEnd);
-
     uMem -= pThis->uBase;
+    AssertReturnVoid(uMem < pThis->cMaxItems);
+
 
     /*

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/uts/common/dtrace/dtrace.c

@@ -12565 +12565 @@
         (void) snprintf(c, sizeof (c), "dtrace_aggid_%p", state);
 #endif
+#ifndef VBOX /* Avoid idProbe = UINT32_MAX as it is used as invalid value by VTG. */
         state->dts_aggid_arena = vmem_create(c, (void *)1, UINT32_MAX, 1,
             NULL, NULL, NULL, 0, VM_SLEEP | VMC_IDENTIFIER);
+#else
+        state->dts_aggid_arena = vmem_create(c, (void *)1, _1G, 1,
+            NULL, NULL, NULL, 0, VM_SLEEP | VMC_IDENTIFIER);
+#endif
 
 #ifndef VBOX
@@ -14868 +14873 @@
         ASSERT(MUTEX_HELD(&cpu_lock));
 
+#ifndef VBOX /* Reduce the area a bit just to be sure our vmem fake doesn't blow up. */
         dtrace_arena = vmem_create("dtrace", (void *)1, UINT32_MAX, 1,
             NULL, NULL, NULL, 0, VM_SLEEP | VMC_IDENTIFIER);
+#else
+        dtrace_arena = vmem_create("dtrace", (void *)1, UINT32_MAX - 16, 1,
+            NULL, NULL, NULL, 0, VM_SLEEP | VMC_IDENTIFIER);
+#endif
 #ifndef VBOX
         dtrace_minor = vmem_create("dtrace_minor", (void *)DTRACEMNRN_CLONE,