Changeset 40916 in vbox for trunk

Timestamp:

Apr 14, 2012 7:53:26 AM (13 years ago)

Author:

vboxsync

Message:

FreeBSD/MemObjR0: Bug fixes (Thanks to Andriy Gapon and Bernhard Froehlich)

File:

• trunk/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c (modified) (5 diffs)

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

@@ -192 +192 @@
 {
     vm_page_t pPages;
+    int cTries = 0;
+
 #if __FreeBSD_version > 1000000
     int fFlags = VM_ALLOC_INTERRUPT | VM_ALLOC_NOBUSY;
     if (fWire)
         fFlags |= VM_ALLOC_WIRED;
-    VM_OBJECT_LOCK(pObject);
-    pPages = vm_page_alloc_contig(pObject, iPIndex, fFlags, cPages, 0, VmPhysAddrHigh, uAlignment, 0, VM_MEMATTR_DEFAULT);
-    VM_OBJECT_UNLOCK(pObject);
+
+    while (cTries <= 1)
+    {
+        VM_OBJECT_LOCK(pObject);
+        pPages = vm_page_alloc_contig(pObject, iPIndex, fFlags, cPages, 0,
+                                      VmPhysAddrHigh, uAlignment, 0, VM_MEMATTR_DEFAULT);
+        VM_OBJECT_UNLOCK(pObject);
+        if (pPages)
+            break;
+        vm_contig_grow_cache(cTries, 0, VmPhysAddrHigh);
+        cTries++;
+    }
+
     return pPages;
 #else
-    pPages = vm_phys_alloc_contig(cPages, 0, VmPhysAddrHigh, uAlignment, 0);
+    while (cTries <= 1)
+    {
+        pPages = vm_phys_alloc_contig(cPages, 0, VmPhysAddrHigh, uAlignment, 0);
+        if (pPages)
+            break;
+        vm_contig_grow_cache(cTries, 0, VmPhysAddrHigh);
+        cTries++;
+    }
+
     if (!pPages)
         return pPages;
@@ -260 +280 @@
                                         vm_paddr_t VmPhysAddrHigh, bool fContiguous, int rcNoMem)
 {
-    int rc;
-    size_t cPages = atop(pMemFreeBSD->Core.cb);
+    vm_offset_t MapAddress = vm_map_min(kernel_map);
+    size_t      cPages = atop(pMemFreeBSD->Core.cb);
+    int         rc;
 
     pMemFreeBSD->pObject = vm_object_allocate(OBJT_PHYS, cPages);
-    vm_offset_t MapAddress;
 
     /* No additional object reference for auto-deallocation upon unmapping. */
@@ -288 +308 @@
         vm_map_remove(kernel_map, MapAddress, MapAddress + pMemFreeBSD->Core.cb);
     }
-    rc = rcNoMem; /** @todo fix translation (borrow from darwin) */
-
-    vm_object_deallocate(pMemFreeBSD->pObject);
+    else
+    {
+        rc = rcNoMem; /** @todo fix translation (borrow from darwin) */
+        vm_object_deallocate(pMemFreeBSD->pObject);
+    }
+
     rtR0MemObjDelete(&pMemFreeBSD->Core);
     return rc;
@@ -320 +343 @@
         return VERR_NO_MEMORY;
 
-    int rc = rtR0MemObjFreeBSDAllocHelper(pMemFreeBSD, fExecutable, _4G, false, VERR_NO_LOW_MEMORY);
+    int rc = rtR0MemObjFreeBSDAllocHelper(pMemFreeBSD, fExecutable, _4G - 1, false, VERR_NO_LOW_MEMORY);
     if (RT_FAILURE(rc))
     {
@@ -339 +362 @@
         return VERR_NO_MEMORY;
 
-    int rc = rtR0MemObjFreeBSDAllocHelper(pMemFreeBSD, fExecutable, _4G, true, VERR_NO_CONT_MEMORY);
+    int rc = rtR0MemObjFreeBSDAllocHelper(pMemFreeBSD, fExecutable, _4G - 1, true, VERR_NO_CONT_MEMORY);
     if (RT_FAILURE(rc))
     {