Changeset 32674 in vbox

Timestamp:

Sep 21, 2010 4:51:50 PM (14 years ago)

Author:

vboxsync

Message:

IPRT: started on some internal ring-0 alloc api.

Location:

trunk/src/VBox/Runtime/r0drv

Files:

• alloc-r0drv.cpp (modified) (1 diff)
• alloc-r0drv.h (modified) (3 diffs)
• darwin/alloc-r0drv-darwin.cpp (modified) (1 diff)
• freebsd/alloc-r0drv-freebsd.c (modified) (2 diffs)
• linux/alloc-r0drv-linux.c (modified) (2 diffs)
• nt/alloc-r0drv-nt.cpp (modified) (1 diff)
• os2/alloc-r0drv-os2.cpp (modified) (1 diff)
• solaris/vbi/alloc-r0drv-solaris.c (modified) (2 diffs)

trunk/src/VBox/Runtime/r0drv/alloc-r0drv.cpp

@@ -318 +318 @@
 RT_EXPORT_SYMBOL(RTMemExecFree);
 
+
+/**
+ * Internal IPRT API for allocating special memory.
+ *
+ * @returns Pointer to the allocated memory, NULL on failure.
+ * @param   cb                  The amount of memory to allocate.
+ * @param   fFlags              Subset of the RTMEMHDR_FLAG_XXX flags.
+ * @param   pszTag              The tag.
+ */
+void *rtR0MemAllocExTag(size_t cb, uint32_t fFlags, const char *pszTag) RT_NO_THROW
+{
+    /** @todo continue later. */
+    return NULL;
+}
+
+
+/**
+ * For freeing memory allocated by rtR0MemAllocExTag.
+ *
+ * @param   pv                  What to free, NULL is fine.
+ */
+void  rtR0MemFreeEx(void *pv) RT_NO_THROW
+{
+    PRTMEMHDR pHdr;
+
+    if (!pv)
+        return;
+    pHdr = (PRTMEMHDR)pv - 1;
+    if (pHdr->u32Magic == RTMEMHDR_MAGIC)
+    {
+        Assert(pHdr->fFlags & RTMEMHDR_FLAG_ALLOC_EX);
+        if (!(pHdr->fFlags & RTMEMHDR_FLAG_FREE_ANY_CTX))
+            RT_ASSERT_INTS_ON();
+
+#ifdef RTR0MEM_STRICT
+        AssertReleaseMsg(!memcmp((uint8_t *)(pHdr + 1) + pHdr->cbReq, &g_abFence[0], RTR0MEM_FENCE_EXTRA),
+                         ("pHdr=%p pv=%p cb=%zu\n"
+                          "fence:    %.*Rhxs\n"
+                          "expected: %.*Rhxs\n",
+                          pHdr, pv, pHdr->cb,
+                          RTR0MEM_FENCE_EXTRA, (uint8_t *)(pHdr + 1) + pHdr->cb,
+                          RTR0MEM_FENCE_EXTRA, &g_abFence[0]));
+#endif
+        rtR0MemFree(pHdr);
+    }
+    else
+        AssertMsgFailed(("pHdr->u32Magic=%RX32 pv=%p\n", pHdr->u32Magic, pv));
+}
+

trunk/src/VBox/Runtime/r0drv/alloc-r0drv.h

@@ -30 +30 @@
 #include <iprt/cdefs.h>
 #include <iprt/types.h>
+#include <iprt/mem.h>
 #include "internal/magics.h"
 
@@ -52 +53 @@
 /** @name RTMEMHDR::fFlags.
  * @{ */
-#define RTMEMHDR_FLAG_ZEROED    RT_BIT(0)
-#define RTMEMHDR_FLAG_EXEC      RT_BIT(1)
+#define RTMEMHDR_FLAG_ZEROED        RT_BIT(0)
+#define RTMEMHDR_FLAG_EXEC          RT_BIT(1)
+#define RTMEMHDR_FLAG_ALLOC_ANY_CTX RT_BIT(2)
+#define RTMEMHDR_FLAG_FREE_ANY_CTX  RT_BIT(3)
+#define RTMEMHDR_FLAG_ANY_CTX       (RTMEMHDR_FLAG_ALLOC_ANY_CTX | RTMEMHDR_FLAG_FREE_ANY_CTX)
+#define RTMEMHDR_FLAG_ALLOC_EX      RT_BIT(4)
 #ifdef RT_OS_LINUX
-#define RTMEMHDR_FLAG_EXEC_HEAP RT_BIT(30)
-#define RTMEMHDR_FLAG_KMALLOC   RT_BIT(31)
+# define RTMEMHDR_FLAG_EXEC_HEAP    RT_BIT(30)
+# define RTMEMHDR_FLAG_KMALLOC      RT_BIT(31)
 #endif
 /** @} */
@@ -63 +68 @@
 PRTMEMHDR   rtR0MemAlloc(size_t cb, uint32_t fFlags);
 void        rtR0MemFree(PRTMEMHDR pHdr);
+#define rtR0MemAllocEx(cb, fFlags) rtR0MemAllocExTag((cb), (fFlags), RTMEM_TAG)
+void       *rtR0MemAllocExTag(size_t cb, uint32_t fFlags, const char *pszTag) RT_NO_THROW;
+void        rtR0MemFreeEx(void *pv) RT_NO_THROW;
 
 RT_C_DECLS_END

trunk/src/VBox/Runtime/r0drv/darwin/alloc-r0drv-darwin.cpp

@@ -43 +43 @@
 PRTMEMHDR rtR0MemAlloc(size_t cb, uint32_t fFlags)
 {
+    AssertReturn(!(fFlags & RTMEMHDR_FLAG_ANY_CTX), NULL);
+
     PRTMEMHDR pHdr = (PRTMEMHDR)IOMalloc(cb + sizeof(*pHdr));
     if (pHdr)

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

@@ -52 +52 @@
 PRTMEMHDR rtR0MemAlloc(size_t cb, uint32_t fFlags)
 {
-    size_t cbAllocated = cb;
-    PRTMEMHDR pHdr = NULL;
+    size_t      cbAllocated = cb;
+    PRTMEMHDR   pHdr        = NULL;
 
     /*
@@ -62 +62 @@
     if (fFlags & RTMEMHDR_FLAG_EXEC)
     {
+        AssertReturn(!(fFlags & RTMEMHDR_FLAG_ANY_CTX), NULL);
+
 # ifdef USE_KMEM_ALLOC_PROT
         pHdr = (PRTMEMHDR)kmem_alloc_prot(kernel_map, cb + sizeof(*pHdr),

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

@@ -113 +113 @@
 PRTMEMHDR rtR0MemAlloc(size_t cb, uint32_t fFlags)
 {
+    PRTMEMHDR pHdr;
+
     /*
      * Allocate.
      */
-    PRTMEMHDR pHdr;
     if (fFlags & RTMEMHDR_FLAG_EXEC)
     {
+        AssertReturn(!(fFlags & RTMEMHDR_FLAG_ANY_CTX), NULL);
+
 #if defined(RT_ARCH_AMD64)
 # ifdef RTMEMALLOC_EXEC_HEAP
@@ -143 +146 @@
     else
     {
-        if (cb <= PAGE_SIZE)
+        if (cb <= PAGE_SIZE || (fFlags & RTMEMHDR_FLAG_ANY_CTX))
         {
             fFlags |= RTMEMHDR_FLAG_KMALLOC;

trunk/src/VBox/Runtime/r0drv/nt/alloc-r0drv-nt.cpp

@@ -41 +41 @@
 PRTMEMHDR rtR0MemAlloc(size_t cb, uint32_t fFlags)
 {
+    AssertReturn(!(fFlags & RTMEMHDR_FLAG_ANY_CTX), NULL);
+
     PRTMEMHDR pHdr = (PRTMEMHDR)ExAllocatePoolWithTag(NonPagedPool, cb + sizeof(*pHdr), IPRT_NT_POOL_TAG);
     if (pHdr)

trunk/src/VBox/Runtime/r0drv/os2/alloc-r0drv-os2.cpp

@@ -43 +43 @@
 PRTMEMHDR rtR0MemAlloc(size_t cb, uint32_t fFlags)
 {
+    AssertReturn(!(fFlags & RTMEMHDR_FLAG_ANY_CTX), NULL);
+
     void *pv = NULL;
     APIRET rc = KernVMAlloc(cb + sizeof(RTMEMHDR), VMDHA_FIXED, &pv, (void **)-1, NULL);

trunk/src/VBox/Runtime/r0drv/solaris/vbi/alloc-r0drv-solaris.c

@@ -46 +46 @@
 PRTMEMHDR rtR0MemAlloc(size_t cb, uint32_t fFlags)
 {
-    size_t cbAllocated = cb;
-    PRTMEMHDR pHdr;
+    size_t      cbAllocated = cb;
+    PRTMEMHDR   pHdr;
+
 #ifdef RT_ARCH_AMD64
     if (fFlags & RTMEMHDR_FLAG_EXEC)
     {
+        AssertReturn(!(fFlags & RTMEMHDR_FLAG_ANY_CTX), NULL);
         cbAllocated = RT_ALIGN_Z(cb + sizeof(*pHdr), PAGE_SIZE) - sizeof(*pHdr);
         pHdr = (PRTMEMHDR)vbi_text_alloc(cbAllocated + sizeof(*pHdr));
@@ -56 +58 @@
     else
 #endif
-    if (fFlags & RTMEMHDR_FLAG_ZEROED)
-        pHdr = (PRTMEMHDR)kmem_zalloc(cb + sizeof(*pHdr), KM_SLEEP);
-    else
-        pHdr = (PRTMEMHDR)kmem_alloc(cb + sizeof(*pHdr), KM_SLEEP);
+    {
+        unsigned fKmFlags = fFlags & RTMEMHDR_FLAG_ALLOC_ANY_CTX ? KM_NOSLEEP : KM_SLEEP;
+        if (fFlags & RTMEMHDR_FLAG_ZEROED)
+            pHdr = (PRTMEMHDR)kmem_zalloc(cb + sizeof(*pHdr), fKmFlags);
+        else
+            pHdr = (PRTMEMHDR)kmem_alloc(cb + sizeof(*pHdr), fKmFlags);
+    }
     if (pHdr)
     {