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

Timestamp:

Apr 23, 2008 2:21:31 PM (17 years ago)

Author:

vboxsync

Message:

Solaris vboxdrv: some memobj error handling fixes and cleanups.

File:

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

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

@@ -312 +312 @@
     /* Lock down kernel pages */
     int rc = as_pagelock(&kas, &ppl, virtAddr, cb, S_WRITE);
-    if (rc != 0)
-    {
-        cmn_err(CE_NOTE,"rtR0MemObjNativeLockKernel: as_pagelock failed rc=%d\n", rc);
-        return VERR_LOCK_FAILED;
-    }
-
-    if (!ppl)
-    {
+    if (!rc)
+    {
+        if (ppl)
+        {
+            pMemSolaris->Core.u.Lock.R0Process = NIL_RTR0PROCESS;   /* means kernel, see rtR0MemObjNativeFree() */
+            pMemSolaris->ppShadowPages = ppl;
+            *ppMem = &pMemSolaris->Core;
+            return VINF_SUCCESS;            
+        }
+
         as_pageunlock(&kas, ppl, virtAddr, cb, S_WRITE);
         cmn_err(CE_NOTE, "rtR0MemObjNativeLockKernel: failed to get shadow pages\n");
-        return VERR_LOCK_FAILED;
-    }
-
-    pMemSolaris->Core.u.Lock.R0Process = NIL_RTR0PROCESS;   /* means kernel, see rtR0MemObjNativeFree() */
-    pMemSolaris->ppShadowPages = ppl;
-    *ppMem = &pMemSolaris->Core;
-    return VINF_SUCCESS;
+    }
+    else
+        cmn_err(CE_NOTE,"rtR0MemObjNativeLockKernel: as_pagelock failed rc=%d\n", rc);
+    rtR0MemObjDelete(pMemSolaris);
+    return VERR_LOCK_FAILED;
 }
 
@@ -431 +431 @@
     int rc;
 
-    /* Create the mapping object */
-    PRTR0MEMOBJSOLARIS pMemSolaris = (PRTR0MEMOBJSOLARIS)rtR0MemObjNew(sizeof(*pMemSolaris), RTR0MEMOBJTYPE_MAPPING, pv, size);
-    if (!pMemSolaris)
-        return VERR_NO_MEMORY;
-
     as_rangelock(useras);
     if (R3PtrFixed != (RTR3PTR)-1)
@@ -486 +481 @@
     }
 
-#if 0
-    /* Lock down the pages and get the shadow page list
-     * In this case we must as_pageunlock if(ppShadowPages) exists while freeing CONT, PAGE
-     */
-    rc = as_pagelock(&kas, &pMemToMapSolaris->ppShadowPages, pv, size, S_WRITE);
-    if (rc != 0 || pMemToMapSolaris->ppShadowPages == NULL)
-    {
-        cmn_err(CE_NOTE, "rtR0MemObjNativeMapUser: as_pagelock failed\n");
+    /* Create the mapping object */
+    PRTR0MEMOBJSOLARIS pMemSolaris = (PRTR0MEMOBJSOLARIS)rtR0MemObjNew(sizeof(*pMemSolaris), RTR0MEMOBJTYPE_MAPPING, pv, size);
+    if (!pMemSolaris)
+    {
+        /* Undo mapping on failure. */
         as_unmap(useras, addr, size);
         return VERR_NO_MEMORY;
     }
 
-    /* Map each page into user space */
-    rw_enter(&useras->a_lock, RW_READER);
-    caddr_t pageAddr = addr;
-    for (iPage = 0; iPage < cPages; iPage++)
-    {
-        hat_memload(useras->a_hat, pageAddr, pMemToMapSolaris->ppShadowPages[iPage], fProt | PROT_USER,
-                HAT_LOAD_NOCONSIST | HAT_STRICTORDER | HAT_LOAD_LOCK);
-        pageAddr += ptob(1);
-    }
-    rw_exit(&useras->a_lock, RW_READER);
-#else
     /* Map each page into user space */
     rw_enter(&useras->a_lock, RW_READER);
@@ -521 +502 @@
     }
     rw_exit(&useras->a_lock);
-#endif
 
     pMemSolaris->Core.u.Mapping.R0Process = (RTR0PROCESS)userproc;