Changeset 19591 in vbox for trunk/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c

Timestamp:

May 11, 2009 11:18:56 PM (16 years ago)

Author:

vboxsync

Message:

Runtime/r0drv-freebsd: Disable the active code for allocating pages and use contigmalloc instead. The old code didn't allocated the pages properly during vm_map_wire resulting in page faults when running the VM and panicing the host. Don't know if contigmalloc has some restrictions which huge RAM configs but for now it works ok (was able to start a 64bit OpenSolaris VM on a 32bit FreeBSD host).

File:

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

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

@@ -99 +99 @@
             else
             {
-                free(pMemFreeBSD->Core.pv, M_IPRTMOBJ);
+                contigfree(pMemFreeBSD->Core.pv, pMemFreeBSD->Core.cb, M_IPRTMOBJ);
                 if (pMemFreeBSD->pMappingObject)
                 {
@@ -186 +186 @@
      *      http://fxr.watson.org/fxr/source/kern/link_elf.c?v=RELENG62#L701
      */
-#if 0
-    pMemFreeBSD->Core.pv = malloc(cb, M_IPRTMOBJ, M_ZERO);
+#if 1
+    pMemFreeBSD->Core.pv = contigmalloc(cb,                   /* size */
+                                        M_IPRTMOBJ,           /* type */
+                                        M_NOWAIT | M_ZERO,    /* flags */
+                                        0,                    /* lowest physical address*/
+                                        _4G-1,                /* highest physical address */
+                                        PAGE_SIZE,            /* alignment. */
+                                        0);                   /* boundrary */
     if (pMemFreeBSD->Core.pv)
     {