Changeset 4717 in vbox for trunk/src/VBox/Runtime/r0drv

Timestamp:

Sep 12, 2007 6:44:18 AM (17 years ago)

Author:

vboxsync

Message:

Solaris changes.

Location:

trunk/src/VBox/Runtime/r0drv/solaris

Files:

• assert-r0drv-solaris.c (modified) (2 diffs)
• memobj-r0drv-solaris.c (modified) (15 diffs)
• semeventmulti-r0drv-solaris.c (added)

trunk/src/VBox/Runtime/r0drv/solaris/assert-r0drv-solaris.c

@@ -37 +37 @@
 #endif
 
-    printf("\r\n!!Assertion Failed!!\r\n"
-           "Expression: %s\r\n"
-           "Location  : %s(%d) %s\r\n",
-           pszExpr, pszFile, uLine, pszFunction);
+    uprintf("\r\n!!Assertion Failed!!\r\n"
+            "Expression: %s\r\n"
+            "Location  : %s(%d) %s\r\n",
+            pszExpr, pszFile, uLine, pszFunction);
 }
 
@@ -59 +59 @@
     szMsg[sizeof(szMsg) - 1] = '\0';
     va_end(va);
-    printf("%s", szMsg);
+    uprintf("%s", szMsg);
 }
 

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

@@ -101 +101 @@
 
         case RTR0MEMOBJTYPE_PAGE:
-            kmem_free(pMemSolaris->Core.pv, pMemSolaris->Core.cb);
+            ddi_umem_free(pMemSolaris->Cookie);
             break;
 
@@ -107 +107 @@
         {
             cmn_err(CE_NOTE, "rtR0MemObjNativeFree: LOCK\n");
-            struct as* addrSpace;
+            struct as *addrSpace;
             if (pMemSolaris->Core.u.Lock.R0Process == NIL_RTR0PROCESS)
                 addrSpace = &kas;
@@ -119 +119 @@
         case RTR0MEMOBJTYPE_MAPPING:
         {
-            struct hat* hatSpace;
-            struct as* addrSpace;
+            struct hat *hatSpace;
+            struct as *addrSpace;
             cmn_err(CE_NOTE, "rtR0MemObjNativeFree: MAPPING\n");
             if (pMemSolaris->Core.u.Mapping.R0Process == NIL_RTR0PROCESS)
@@ -164 +164 @@
         return VERR_NO_MEMORY;
 
-    /** @todo r=bird: The man page says: "The allocated memory is at least double-word aligned, so it can hold any C data structure. No greater alignment can be assumed." */
-    void* virtAddr = kmem_alloc(cb, KM_SLEEP);
+    void *virtAddr = ddi_umem_alloc(cb, DDI_UMEM_SLEEP, &pMemSolaris->Cookie);
     if (!virtAddr)
     {
         rtR0MemObjDelete(&pMemSolaris->Core);
-        return VERR_NO_MEMORY;
+        return VERR_NO_PAGE_MEMORY;
     }
     
@@ -215 +214 @@
     {
         rtR0MemObjDelete(&pMemSolaris->Core);
-        return VERR_NO_MEMORY;
+        return VERR_NO_CONT_MEMORY;
     }
 
@@ -258 +257 @@
 int rtR0MemObjNativeLockUser(PPRTR0MEMOBJINTERNAL ppMem, RTR3PTR R3Ptr, size_t cb, RTR0PROCESS R0Process)
 {
-    /* Create the object */
+    /* Create the locking object */
     PRTR0MEMOBJSOLARIS pMemSolaris = (PRTR0MEMOBJSOLARIS)rtR0MemObjNew(sizeof(*pMemSolaris), RTR0MEMOBJTYPE_LOCK, (void *)R3Ptr, cb);
     if (!pMemSolaris)
@@ -270 +269 @@
     page_t **ppl;
 
+    /* Lock down user pages */
     int rc = as_pagelock(useras, &ppl, (caddr_t)R3Ptr, cb, S_WRITE);
     if (rc != 0)
     {
         cmn_err(CE_NOTE,"rtR0MemObjNativeLockUser: as_pagelock failed rc=%d\n", rc);
-        return VERR_NO_MEMORY;
+        return VERR_LOCK_FAILED;
     }
 
@@ -281 +281 @@
         as_pageunlock(useras, ppl, (caddr_t)R3Ptr, cb, S_WRITE);
         cmn_err(CE_NOTE, "rtR0MemObjNativeLockUser: as_pagelock failed to get shadow pages\n");
-        return VERR_NO_MEMORY;
+        return VERR_LOCK_FAILED;
     }
     
@@ -293 +293 @@
 int rtR0MemObjNativeLockKernel(PPRTR0MEMOBJINTERNAL ppMem, void *pv, size_t cb)
 {
-    /* Create the object */
+    /* Create the locking object */
     PRTR0MEMOBJSOLARIS pMemSolaris = (PRTR0MEMOBJSOLARIS)rtR0MemObjNew(sizeof(*pMemSolaris), RTR0MEMOBJTYPE_LOCK, pv, cb);
     if (!pMemSolaris)
@@ -301 +301 @@
     page_t **ppl;
     
+    /* Lock down kernel pages */
     int rc = as_pagelock(&kas, &ppl, virtAddr, cb, S_WRITE);
     if (rc != 0)
-        return VERR_NO_MEMORY;
+    {
+        cmn_err(CE_NOTE,"rtR0MemObjNativeLockKernel: as_pagelock failed rc=%d\n", rc);
+        return VERR_LOCK_FAILED;
+    }
 
     if (!ppl)
     {
         as_pageunlock(&kas, ppl, virtAddr, cb, S_WRITE);
-        cmn_err(CE_NOTE, "rtR0MemObjNativeLockUser: failed to get shadow pages\n");
-        return VERR_NO_MEMORY;
+        cmn_err(CE_NOTE, "rtR0MemObjNativeLockKernel: failed to get shadow pages\n");
+        return VERR_LOCK_FAILED;
     }
 
@@ -333 +337 @@
 {
     PRTR0MEMOBJSOLARIS pMemToMapSolaris = (PRTR0MEMOBJSOLARIS)pMemToMap;    
-    size_t size = P2ROUNDUP(pMemToMapSolaris->Core.cb, PAGE_SIZE); /* r=bird: not necessary, see the specs / caller implementation. */
+    size_t size = pMemToMapSolaris->Core.cb;
     void *pv = pMemToMapSolaris->Core.pv;
     pgcnt_t cPages = btop(size);
@@ -364 +368 @@
             return VERR_NO_MEMORY;
         }
-        /** @todo r=bird: check address against uAlignment, just fail if it's not matching. */
+        
+        /* Check address against alignment, fail if it doesn't match */
+        if ((uintptr_t)addr & (uAlignment - 1))
+        {
+            as_rangeunlock(&kas);
+            cmn_err(CE_NOTE, "rtR0MemObjNativeMapKernel: map_addr alignment(%ld) failed.\n", uAlignment);
+            return VERR_MAP_FAILED;
+        }
     }
     
@@ -401 +412 @@
 {
     PRTR0MEMOBJSOLARIS pMemToMapSolaris = (PRTR0MEMOBJSOLARIS)pMemToMap;    
-    size_t size = P2ROUNDUP(pMemToMapSolaris->Core.cb, PAGE_SIZE); /** @todo r=bird: this isn't necessary, see the specs. */
+    size_t size = pMemToMapSolaris->Core.cb;
     proc_t *userproc = (proc_t *)R0Process;
     struct as *useras = userproc->p_as;
@@ -441 +452 @@
             as_rangeunlock(useras);
             cmn_err(CE_NOTE, "rtR0MemObjNativeMapUser: map_addr failed\n");
-            return VERR_NO_MEMORY;
-        }
-
-        /** @todo r=bird: check address against uAlignment, just fail if it's not matching. */
+            return VERR_MAP_FAILED;
+        }
+        
+        /* Check address against alignment, fail if it doesn't match */
+        if ((uintptr_t)addr & (uAlignment - 1))
+        {
+            as_rangeunlock(useras);
+            cmn_err(CE_NOTE, "rtR0MemObjNativeMapUser: map_addr alignment(%ld) failed.\n", uAlignment);
+            return VERR_MAP_FAILED;
+        }
     }
     
@@ -456 +473 @@
     {
         cmn_err(CE_NOTE, "rtR0MemObjNativeMapUser: as_map failure.\n");
-        return VERR_NO_MEMORY;
+        return VERR_MAP_FAILED;
     }