Changeset 10457 in vbox for trunk/src/VBox/Runtime/r0drv/solaris/memobj-r0drv-solaris.c

Timestamp:

Jul 10, 2008 7:08:24 AM (16 years ago)

Author:

vboxsync

Message:

Solaris/r0drv: fixed lockkernel.
Found this while exploring vboxvfs mapping, though currently unused.

File:

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

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

@@ -114 +114 @@
         {
             struct as *addrSpace;
-            if (pMemSolaris->Core.u.Lock.R0Process == NIL_RTR0PROCESS)
-                addrSpace = &kas;
-            else
+            if (pMemSolaris->Core.u.Lock.R0Process != NIL_RTR0PROCESS)
+            {
                 addrSpace = ((proc_t *)pMemSolaris->Core.u.Lock.R0Process)->p_as;
-
-            as_pageunlock(addrSpace, pMemSolaris->ppShadowPages, pMemSolaris->Core.pv, pMemSolaris->Core.cb, S_WRITE);
+                as_pageunlock(addrSpace, pMemSolaris->ppShadowPages, pMemSolaris->Core.pv, pMemSolaris->Core.cb, S_WRITE);
+            }
+            /* Nothing to unlock for kernel addresses. */
             break;
         }
@@ -300 +300 @@
         return VERR_NO_MEMORY;
 
-    caddr_t virtAddr = (caddr_t)((uintptr_t)pv & (uintptr_t)PAGEMASK);
-    page_t **ppl;
-
-    /* Lock down kernel pages */
-    int rc = as_pagelock(&kas, &ppl, virtAddr, cb, S_WRITE);
-    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");
-    }
-    else
-        cmn_err(CE_NOTE,"rtR0MemObjNativeLockKernel: as_pagelock failed rc=%d\n", rc);
-    rtR0MemObjDelete(&pMemSolaris->Core);
-    return VERR_LOCK_FAILED;
+    /* Nothing to do here for kernel addresses. */
+
+    pMemSolaris->Core.u.Lock.R0Process = RTR0ProcHandleSelf();
+    pMemSolaris->ppShadowPages = NULL;
+    *ppMem = &pMemSolaris->Core;
+    return VINF_SUCCESS;    
 }