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

Timestamp:

Nov 6, 2009 7:36:50 AM (15 years ago)

Author:

vboxsync

Message:

Solaris/r0drv: fix as_pagelock access error (host/guest common IPRT now).

Location:

trunk/src/VBox/Runtime/r0drv/solaris/vbi

Files:

• i86pc/os/vbi.c (modified) (3 diffs)
• i86pc/sys/vbi.h (modified) (1 diff)
• memobj-r0drv-solaris.c (modified) (9 diffs)

trunk/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/os/vbi.c

@@ -667 +667 @@
 
 int
-vbi_lock_va(void *addr, size_t len, void **handle)
+vbi_lock_va(void *addr, size_t len, int access, void **handle)
 {
         faultcode_t err;
@@ -677 +677 @@
         if (!IS_KERNEL(addr)) {
                 err = as_fault(VBIPROC()->p_as->a_hat, VBIPROC()->p_as,
-                    (caddr_t)addr, len, F_SOFTLOCK, S_WRITE);
+                    (caddr_t)addr, len, F_SOFTLOCK, access);
                 if (err != 0) {
                         VBI_VERBOSE("vbi_lock_va() failed to lock");
@@ -688 +688 @@
 /*ARGSUSED*/
 void
-vbi_unlock_va(void *addr, size_t len, void *handle)
+vbi_unlock_va(void *addr, size_t len, int access, void *handle)
 {
         if (!IS_KERNEL(addr))
                 as_fault(VBIPROC()->p_as->a_hat, VBIPROC()->p_as,
-                    (caddr_t)addr, len, F_SOFTUNLOCK, S_WRITE);
+                    (caddr_t)addr, len, F_SOFTUNLOCK, access);
 }
 

trunk/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/sys/vbi.h

@@ -210 +210 @@
  * returns 0 for success, non-zero errno on failure
  */
-extern int vbi_lock_va(void *addr, size_t len, void **handle);
-extern void vbi_unlock_va(void *addr, size_t len, void *handle);
+extern int vbi_lock_va(void *addr, size_t len, int access, void **handle);
+extern void vbi_unlock_va(void *addr, size_t len, int access, void *handle);
 
 /*

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

@@ -59 +59 @@
     ddi_umem_cookie_t   Cookie;
     /** Shadow locked pages. */
-    void              *handle;
+    void               *pvHandle;
+    /** Access during locking. */
+    int                 fAccess;
 } RTR0MEMOBJSOLARIS, *PRTR0MEMOBJSOLARIS;
 
@@ -83 +85 @@
 
         case RTR0MEMOBJTYPE_LOCK:
-            vbi_unlock_va(pMemSolaris->Core.pv, pMemSolaris->Core.cb, pMemSolaris->handle);
+            vbi_unlock_va(pMemSolaris->Core.pv, pMemSolaris->Core.cb, pMemSolaris->fAccess, pMemSolaris->pvHandle);
             break;
 
@@ -125 +127 @@
 
     pMemSolaris->Core.pv = virtAddr;
-    pMemSolaris->handle = NULL;
+    pMemSolaris->pvHandle = NULL;
     *ppMem = &pMemSolaris->Core;
     return VINF_SUCCESS;
@@ -150 +152 @@
     }
     pMemSolaris->Core.pv = virtAddr;
-    pMemSolaris->handle = NULL;
+    pMemSolaris->pvHandle = NULL;
     *ppMem = &pMemSolaris->Core;
     return VINF_SUCCESS;
@@ -177 +179 @@
     pMemSolaris->Core.pv = virtAddr;
     pMemSolaris->Core.u.Cont.Phys = phys;
-    pMemSolaris->handle = NULL;
+    pMemSolaris->pvHandle = NULL;
     *ppMem = &pMemSolaris->Core;
     return VINF_SUCCESS;
@@ -223 +225 @@
         return VERR_NO_MEMORY;
 
-    void *ppl;
+    int fPageAccess = S_READ;
+    if (fPageAccess & RTMEM_PROT_WRITE)
+        fPageAccess = S_WRITE;
+    if (fPageAccess & RTMEM_PROT_EXEC)
+        fPageAccess = S_EXEC;
+    void *pvPageList = NULL;
 
     /* Lock down user pages */
-    int rc = vbi_lock_va((caddr_t)R3Ptr, cb, &ppl);
+    int rc = vbi_lock_va((caddr_t)R3Ptr, cb, fPageAccess, &pvPageList);
     if (rc != 0)
     {
@@ -235 +242 @@
 
     pMemSolaris->Core.u.Lock.R0Process = (RTR0PROCESS)vbi_proc();
-    pMemSolaris->handle = ppl;
+    pMemSolaris->pvHandle = pvPageList;
+    pMemSolaris->fAccess = fPageAccess;
     *ppMem = &pMemSolaris->Core;
     return VINF_SUCCESS;
@@ -249 +257 @@
         return VERR_NO_MEMORY;
 
-    void *ppl;
-    int rc = vbi_lock_va((caddr_t)pv, cb, &ppl);
+    int fPageAccess = S_READ;
+    if (fPageAccess & RTMEM_PROT_WRITE)
+        fPageAccess = S_WRITE;
+    if (fPageAccess & RTMEM_PROT_EXEC)
+        fPageAccess = S_EXEC;
+    void *pvPageList = NULL;
+    int rc = vbi_lock_va((caddr_t)pv, cb, fPageAccess, &pvPageList);
     if (rc != 0)
     {
@@ -259 +272 @@
 
     pMemSolaris->Core.u.Lock.R0Process = NIL_RTR0PROCESS;
-    pMemSolaris->handle = ppl;
+    pMemSolaris->pvHandle = pvPageList;
+    pMemSolaris->fAccess = fPageAccess;
     *ppMem = &pMemSolaris->Core;
     return VINF_SUCCESS;