Changeset 32707 in vbox for trunk/src/VBox/Runtime/r0drv/linux

Timestamp:

Sep 23, 2010 10:15:08 AM (15 years ago)

Author:

vboxsync

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

66136

Message:

IPRT: Added RTMemAllocEx[Tag] and RTMemFreeEx, only implemented in ring-0 only.

Location:

trunk/src/VBox/Runtime/r0drv/linux

Files:

• alloc-r0drv-linux.c (modified) (3 diffs)
• timer-r0drv-linux.c (modified) (3 diffs)

trunk/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c

@@ -111 +111 @@
  * OS specific allocation function.
  */
-PRTMEMHDR rtR0MemAlloc(size_t cb, uint32_t fFlags)
+int rtR0MemAllocEx(size_t cb, uint32_t fFlags, PRTMEMHDR *ppHdr)
 {
     PRTMEMHDR pHdr;
@@ -120 +120 @@
     if (fFlags & RTMEMHDR_FLAG_EXEC)
     {
-        AssertReturn(!(fFlags & RTMEMHDR_FLAG_ANY_CTX), NULL);
+        if (fFlags & RTMEMHDR_FLAG_ANY_CTX)
+            return VERR_NOT_SUPPORTED;
 
 #if defined(RT_ARCH_AMD64)
@@ -149 +150 @@
         {
             fFlags |= RTMEMHDR_FLAG_KMALLOC;
-            pHdr = kmalloc(cb + sizeof(*pHdr), GFP_KERNEL);
+            pHdr = kmalloc(cb + sizeof(*pHdr),
+                           (fFlags & RTMEMHDR_FLAG_ANY_CTX_ALLOC) ? GFP_ATOMIC : GFP_KERNEL);
         }
         else
             pHdr = vmalloc(cb + sizeof(*pHdr));
     }
+    if (RT_UNLIKELY(!pHdr))
+        return VERR_NO_MEMORY;
 
     /*
      * Initialize.
      */
-    if (pHdr)
-    {
-        pHdr->u32Magic  = RTMEMHDR_MAGIC;
-        pHdr->fFlags    = fFlags;
-        pHdr->cb        = cb;
-        pHdr->cbReq     = cb;
-    }
-    return pHdr;
+    pHdr->u32Magic  = RTMEMHDR_MAGIC;
+    pHdr->fFlags    = fFlags;
+    pHdr->cb        = cb;
+    pHdr->cbReq     = cb;
+
+    *ppHdr = pHdr;
+    return VINF_SUCCESS;
 }
 

trunk/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c

@@ -434 +434 @@
      */
     ASMAtomicWriteU32(&pTimer->u32Magic, ~RTTIMER_MAGIC);
-#if 0 /*fixme*/
-    rtR0MemFreeNoCtxCheck(pTimer);
-#else
-    RTMemFree(pTimer);
-#endif
+    RTMemFreeEx(pTimer, RT_OFFSETOF(RTTIMER, aSubTimers[pTimer->cCpus]));
     if (hSpinlock != NIL_RTSPINLOCK)
         RTSpinlockDestroy(hSpinlock);
@@ -1393 +1389 @@
     RTCPUID     iCpu;
     unsigned    cCpus;
+    int         rc;
 
     *ppTimer = NULL;
@@ -1419 +1416 @@
 #endif
 
-    pTimer = (PRTTIMER)RTMemAllocZ(RT_OFFSETOF(RTTIMER, aSubTimers[cCpus]));
-    if (!pTimer)
-        return VERR_NO_MEMORY;
+    rc = RTMemAllocEx(RT_OFFSETOF(RTTIMER, aSubTimers[cCpus]), 0,
+                      RTMEMALLOCEX_FLAGS_ZEROED | RTMEMALLOCEX_FLAGS_ANY_CTX_FREE, (void **)&pTimer);
+    if (RT_FAILURE(rc))
+        return rc;
 
     /*