Changeset 27414 in vbox

Timestamp:

Mar 16, 2010 4:14:52 PM (15 years ago)

Author:

vboxsync

Message:

Solaris/r0drv: use ddi_umem_alloc for NC pages.

File:

• trunk/src/VBox/Runtime/r0drv/solaris/vbi/memobj-r0drv-solaris.c (modified) (3 diffs)

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

@@ -81 +81 @@
 
         case RTR0MEMOBJTYPE_PHYS_NC:
-            LogRel(("MemObjNativeFree virtAddr=%p physAddr=%#x cb=%u\n", pMemSolaris->Core.pv, vbi_va_to_pa(pMemSolaris->Core.pv), (unsigned)pMemSolaris->Core.cb));
 #if 0
             vbi_phys_free(pMemSolaris->Core.pv, pMemSolaris->Core.cb);
-#else
+#endif
             ddi_umem_free(pMemSolaris->Cookie);
-#endif
             break;
 
@@ -180 +178 @@
     /* Allocate physically non-contiguous page-aligned memory. */
     uint64_t physAddr = PhysHighest;
+
 #if 0
+    /*
+     * The contig_alloc() way of allocating NC pages is broken or does not match our semantics. Refer #4716 for details.
+     */
     caddr_t virtAddr  = vbi_phys_alloc(&physAddr, cb, PAGE_SIZE, 0 /* non-contiguous */);
-#else
+#endif
     caddr_t virtAddr = ddi_umem_alloc(cb, DDI_UMEM_SLEEP, &pMemSolaris->Cookie);
-#endif
     if (RT_UNLIKELY(virtAddr == NULL))
     {
@@ -196 +197 @@
     pMemSolaris->pvHandle = NULL;
     *ppMem = &pMemSolaris->Core;
-    LogRel(("ddi_umem_alloc virtAddr=%p physAddr=%#x cb=%u\n", virtAddr, physAddr, (unsigned)cb));
     return VINF_SUCCESS;
 #else