Changeset 39744 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jan 10, 2012 6:15:04 PM (13 years ago)

Author:

vboxsync

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

75626

Message:

rtr0memobj: Status code adjustments.

Location:

trunk/src/VBox/Runtime/r0drv

Files:

• darwin/memobj-r0drv-darwin.cpp (modified) (1 diff)
• freebsd/memobj-r0drv-freebsd.c (modified) (19 diffs)
• linux/memobj-r0drv-linux.c (modified) (9 diffs)
• nt/memobj-r0drv-nt.cpp (modified) (1 diff)
• os2/memobj-r0drv-os2.cpp (modified) (1 diff)

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

@@ -508 +508 @@
                 }
 
-                rc = VERR_NO_MEMORY;
+                if (enmType == RTR0MEMOBJTYPE_PHYS_NC)
+                    rc = VERR_NO_PHYS_MEMORY;
+                else if (enmType == RTR0MEMOBJTYPE_LOW)
+                    rc = VERR_NO_LOW_MEMORY;
+                else if (enmType == RTR0MEMOBJTYPE_CONT)
+                    rc = VERR_NO_CONT_MEMORY;
+                else
+                    rc = VERR_NO_MEMORY;
             }
             else

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

@@ -45 +45 @@
 #include "internal/memobj.h"
 
+
 /*******************************************************************************
 *   Structures and Typedefs                                                    *
@@ -62 +63 @@
 MALLOC_DEFINE(M_IPRTMOBJ, "iprtmobj", "IPRT - R0MemObj");
 
+
 /**
  * Gets the virtual memory map the specified object is mapped into.
@@ -112 +114 @@
         case RTR0MEMOBJTYPE_LOW:
         case RTR0MEMOBJTYPE_CONT:
-        {
             rc = vm_map_remove(kernel_map,
                                 (vm_offset_t)pMemFreeBSD->Core.pv,
@@ -118 +119 @@
             AssertMsg(rc == KERN_SUCCESS, ("%#x", rc));
             break;
-        }
 
         case RTR0MEMOBJTYPE_LOCK:
@@ -223 +223 @@
 static int rtR0MemObjFreeBSDPhysAllocHelper(vm_object_t pObject, u_long cPages,
                                             vm_paddr_t VmPhysAddrHigh, u_long uAlignment,
-                                            bool fContiguous, bool fWire)
+                                            bool fContiguous, bool fWire, int rcNoMem)
 {
     if (fContiguous)
@@ -230 +230 @@
                                                    uAlignment, fWire) != NULL)
             return VINF_SUCCESS;
-        else
-            return VERR_NO_MEMORY;
+        return rcNoMem;
     }
 
@@ -252 +251 @@
             }
             VM_OBJECT_UNLOCK(pObject);
-            return VERR_NO_MEMORY;
+            return rcNoMem;
         }
     }
@@ -259 +258 @@
 
 static int rtR0MemObjFreeBSDAllocHelper(PRTR0MEMOBJFREEBSD pMemFreeBSD, bool fExecutable,
-                                        vm_paddr_t VmPhysAddrHigh, bool fContiguous)
+                                        vm_paddr_t VmPhysAddrHigh, bool fContiguous, int rcNoMem)
 {
     int rc;
@@ -275 +274 @@
     {
         rc = rtR0MemObjFreeBSDPhysAllocHelper(pMemFreeBSD->pObject, cPages,
-                                              VmPhysAddrHigh, PAGE_SIZE, fContiguous, false);
-        if (RT_SUCCESS(rc)) {
+                                              VmPhysAddrHigh, PAGE_SIZE, fContiguous,
+                                              false, rcNoMem);
+        if (RT_SUCCESS(rc))
+        {
             vm_map_wire(kernel_map, MapAddress, MapAddress + pMemFreeBSD->Core.cb,
                         VM_MAP_WIRE_SYSTEM | VM_MAP_WIRE_NOHOLES);
@@ -287 +288 @@
         vm_map_remove(kernel_map, MapAddress, MapAddress + pMemFreeBSD->Core.cb);
     }
-    rc = VERR_NO_MEMORY; /** @todo fix translation (borrow from darwin) */
+    rc = rcNoMem; /** @todo fix translation (borrow from darwin) */
 
     vm_object_deallocate(pMemFreeBSD->pObject);
@@ -300 +301 @@
         return VERR_NO_MEMORY;
 
-    int rc = rtR0MemObjFreeBSDAllocHelper(pMemFreeBSD, fExecutable, ~(vm_paddr_t)0, false);
+    int rc = rtR0MemObjFreeBSDAllocHelper(pMemFreeBSD, fExecutable, ~(vm_paddr_t)0, false, VERR_NO_MEMORY);
     if (RT_FAILURE(rc))
     {
@@ -319 +320 @@
         return VERR_NO_MEMORY;
 
-    int rc = rtR0MemObjFreeBSDAllocHelper(pMemFreeBSD, fExecutable, _4G, false);
+    int rc = rtR0MemObjFreeBSDAllocHelper(pMemFreeBSD, fExecutable, _4G, false, VERR_NO_LOW_MEMORY);
     if (RT_FAILURE(rc))
     {
@@ -338 +339 @@
         return VERR_NO_MEMORY;
 
-    int rc = rtR0MemObjFreeBSDAllocHelper(pMemFreeBSD, fExecutable, _4G, true);
+    int rc = rtR0MemObjFreeBSDAllocHelper(pMemFreeBSD, fExecutable, _4G, true, VERR_NO_CONT_MEMORY);
     if (RT_FAILURE(rc))
     {
@@ -354 +355 @@
                                            size_t cb,
                                            RTHCPHYS PhysHighest, size_t uAlignment,
-                                           bool fContiguous)
+                                           bool fContiguous, int rcNoMem)
 {
     uint32_t   cPages = atop(cb);
@@ -373 +374 @@
 
     int rc = rtR0MemObjFreeBSDPhysAllocHelper(pMemFreeBSD->pObject, cPages, VmPhysAddrHigh,
-                                              uAlignment, fContiguous, true);
-
-    if (RT_FAILURE(rc)) {
-        vm_object_deallocate(pMemFreeBSD->pObject);
-        rtR0MemObjDelete(&pMemFreeBSD->Core);
-    }
-    else
+                                              uAlignment, fContiguous, true, rcNoMem);
+    if (RT_SUCCESS(rc))
     {
         if (fContiguous)
@@ -392 +388 @@
         *ppMem = &pMemFreeBSD->Core;
     }
+    else
+    {
+        vm_object_deallocate(pMemFreeBSD->pObject);
+        rtR0MemObjDelete(&pMemFreeBSD->Core);
+    }
 
     return rc;
@@ -399 +400 @@
 DECLHIDDEN(int) rtR0MemObjNativeAllocPhys(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, RTHCPHYS PhysHighest, size_t uAlignment)
 {
-    return rtR0MemObjFreeBSDAllocPhysPages(ppMem, RTR0MEMOBJTYPE_PHYS, cb, PhysHighest, uAlignment, true);
+    return rtR0MemObjFreeBSDAllocPhysPages(ppMem, RTR0MEMOBJTYPE_PHYS, cb, PhysHighest, uAlignment, true, VERR_NO_MEMORY);
 }
 
@@ -405 +406 @@
 DECLHIDDEN(int) rtR0MemObjNativeAllocPhysNC(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, RTHCPHYS PhysHighest)
 {
-    return rtR0MemObjFreeBSDAllocPhysPages(ppMem, RTR0MEMOBJTYPE_PHYS_NC, cb, PhysHighest, PAGE_SIZE, false);
+    return rtR0MemObjFreeBSDAllocPhysPages(ppMem, RTR0MEMOBJTYPE_PHYS_NC, cb, PhysHighest, PAGE_SIZE, false, VERR_NO_PHYS_MEMORY);
 }
 
@@ -497 +498 @@
      * The pvFixed address range must be within the VM space when specified.
      */
-    if (pvFixed != (void *)-1
+    if (   pvFixed != (void *)-1
         && (    (vm_offset_t)pvFixed      < vm_map_min(pMap)
             ||  (vm_offset_t)pvFixed + cb > vm_map_max(pMap)))

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

@@ -180 +180 @@
  * @param   fFlagsLnx   The page allocation flags (GPFs).
  * @param   fContiguous Whether the allocation must be contiguous.
+ * @param   rcNoMem     What to return when we're out of pages.
  */
 static int rtR0MemObjLinuxAllocPages(PRTR0MEMOBJLNX *ppMemLnx, RTR0MEMOBJTYPE enmType, size_t cb,
-                                     size_t uAlignment, unsigned fFlagsLnx, bool fContiguous)
+                                     size_t uAlignment, unsigned fFlagsLnx, bool fContiguous, int rcNoMem)
 {
     size_t          iPage;
@@ -231 +232 @@
         {
             rtR0MemObjDelete(&pMemLnx->Core);
-            return VERR_NO_MEMORY;
+            return rcNoMem;
         }
     }
@@ -245 +246 @@
                     __free_page(pMemLnx->apPages[iPage]);
                 rtR0MemObjDelete(&pMemLnx->Core);
-                return VERR_NO_MEMORY;
+                return rcNoMem;
             }
         }
@@ -256 +257 @@
     {
         rtR0MemObjDelete(&pMemLnx->Core);
-        return VERR_NO_MEMORY;
+        return rcNoMem;
     }
     for (iPage = 0; iPage < cPages; iPage++)
@@ -295 +296 @@
                     (unsigned long)cb, (unsigned long)uAlignment, rtR0MemObjLinuxOrder(cPages), (unsigned long)page_to_phys(pMemLnx->apPages[0]));
             rtR0MemObjLinuxFreePages(pMemLnx);
-            return VERR_NO_MEMORY;
+            return rcNoMem;
         }
     }
@@ -541 +542 @@
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 22)
-    rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_PAGE, cb, PAGE_SIZE, GFP_HIGHUSER, false /* non-contiguous */);
+    rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_PAGE, cb, PAGE_SIZE, GFP_HIGHUSER,
+                                   false /* non-contiguous */, VERR_NO_MEMORY);
 #else
-    rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_PAGE, cb, PAGE_SIZE, GFP_USER, false /* non-contiguous */);
+    rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_PAGE, cb, PAGE_SIZE, GFP_USER,
+                                   false /* non-contiguous */, VERR_NO_MEMORY);
 #endif
     if (RT_SUCCESS(rc))
@@ -570 +573 @@
 #if (defined(RT_ARCH_AMD64) || defined(CONFIG_X86_PAE)) && defined(GFP_DMA32)
     /* ZONE_DMA32: 0-4GB */
-    rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_LOW, cb, PAGE_SIZE, GFP_DMA32, false /* non-contiguous */);
+    rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_LOW, cb, PAGE_SIZE, GFP_DMA32,
+                                   false /* non-contiguous */, VERR_NO_LOW_MEMORY);
     if (RT_FAILURE(rc))
 #endif
 #ifdef RT_ARCH_AMD64
         /* ZONE_DMA: 0-16MB */
-        rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_LOW, cb, PAGE_SIZE, GFP_DMA, false /* non-contiguous */);
+        rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_LOW, cb, PAGE_SIZE, GFP_DMA,
+                                       false /* non-contiguous */, VERR_NO_LOW_MEMORY);
 #else
 # ifdef CONFIG_X86_PAE
 # endif
         /* ZONE_NORMAL: 0-896MB */
-        rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_LOW, cb, PAGE_SIZE, GFP_USER, false /* non-contiguous */);
+        rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_LOW, cb, PAGE_SIZE, GFP_USER,
+                                       false /* non-contiguous */, VERR_NO_LOW_MEMORY);
 #endif
     if (RT_SUCCESS(rc))
@@ -606 +612 @@
 #if (defined(RT_ARCH_AMD64) || defined(CONFIG_X86_PAE)) && defined(GFP_DMA32)
     /* ZONE_DMA32: 0-4GB */
-    rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_CONT, cb, PAGE_SIZE, GFP_DMA32, true /* contiguous */);
+    rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_CONT, cb, PAGE_SIZE, GFP_DMA32,
+                                   true /* contiguous */, VERR_NO_CONT_MEMORY);
     if (RT_FAILURE(rc))
 #endif
 #ifdef RT_ARCH_AMD64
         /* ZONE_DMA: 0-16MB */
-        rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_CONT, cb, PAGE_SIZE, GFP_DMA, true /* contiguous */);
+        rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_CONT, cb, PAGE_SIZE, GFP_DMA,
+                                       true /* contiguous */, VERR_NO_CONT_MEMORY);
 #else
         /* ZONE_NORMAL (32-bit hosts): 0-896MB */
-        rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_CONT, cb, PAGE_SIZE, GFP_USER, true /* contiguous */);
+        rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_CONT, cb, PAGE_SIZE, GFP_USER,
+                                       true /* contiguous */, VERR_NO_CONT_MEMORY);
 #endif
     if (RT_SUCCESS(rc))
@@ -658 +667 @@
 
     rc = rtR0MemObjLinuxAllocPages(&pMemLnx, enmType, cb, uAlignment, fGfp,
-                                   enmType == RTR0MEMOBJTYPE_PHYS /* contiguous / non-contiguous */);
+                                   enmType == RTR0MEMOBJTYPE_PHYS /* contiguous / non-contiguous */,
+                                   VERR_NO_PHYS_MEMORY);
     if (RT_FAILURE(rc))
         return rc;

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

@@ -273 +273 @@
             if (rtR0MemObjNativeGetPagePhysAddr(*ppMem, iPage) >= _4G)
             {
-                rc = VERR_NO_MEMORY;
+                rc = VERR_NO_LOW_MEMORY;
                 break;
             }

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

@@ -167 +167 @@
     }
     rtR0MemObjDelete(&pMemOs2->Core);
-    return RTErrConvertFromOS2(rc);
+    rc = RTErrConvertFromOS2(rc);
+    return rc == VERR_NO_MEMORY ? VERR_NO_LOW_MEMORY : rc;
 }