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

Timestamp:

Jun 22, 2007 4:37:40 AM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

22198

Message:

RTR0MemObjMapKernel for OS/2.

Location:

trunk/src/VBox/Runtime/r0drv

Files:

• memobj-r0drv.cpp (modified) (1 diff)
• os2/memobj-r0drv-os2.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/r0drv/memobj-r0drv.cpp

@@ -580 +580 @@
  * @param   fProt           Combination of RTMEM_PROT_* flags (except RTMEM_PROT_NONE).
  */
-RTR0DECL(int) RTR0MemObjMapKernel(PRTR0MEMOBJ pMemObj, PRTR0MEMOBJ MemObjToMap, void *pvFixed, size_t uAlignment, unsigned fProt)
+RTR0DECL(int) RTR0MemObjMapKernel(PRTR0MEMOBJ pMemObj, RTR0MEMOBJ MemObjToMap, void *pvFixed, size_t uAlignment, unsigned fProt)
 {
     /* sanity checks. */

trunk/src/VBox/Runtime/r0drv/os2/memobj-r0drv-os2.cpp

@@ -80 +80 @@
             if (!pMemOs2->Core.pv)
                 break;
+
+        case RTR0MEMOBJTYPE_MAPPING:
+            if (pMemOs2->Core.u.Mapping.R0Process == NIL_RTR0PROCESS)
+                break; 
+
+            /* fall thru */
         case RTR0MEMOBJTYPE_PAGE:
         case RTR0MEMOBJTYPE_LOW:
         case RTR0MEMOBJTYPE_CONT:
-        case RTR0MEMOBJTYPE_MAPPING:
             rc = KernVMFree(pMemOs2->Core.pv);
             AssertMsg(!rc, ("rc=%d type=%d pv=%p cb=%#zx\n", rc, pMemOs2->Core.enmType, pMemOs2->Core.pv, pMemOs2->Core.cb));
@@ -289 +294 @@
 int rtR0MemObjNativeMapKernel(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ pMemToMap, void *pvFixed, size_t uAlignment, unsigned fProt)
 {
-    return VERR_NOT_IMPLEMENTED;
-}
-
-
-int rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ pMemToMap, void *pvFixed, size_t uAlignment, unsigned fProt, RTR0PROCESS R0Process)
-{
-    AssertMsgReturn(R0Process == RTR0ProcHandleSelf(), ("%p != %p\n", R0Process, RTR0ProcHandleSelf()), VERR_NOT_SUPPORTED);
     AssertMsgReturn(pvFixed == (void *)-1, ("%p\n", pvFixed), VERR_NOT_SUPPORTED);
 
+/** @todo finish the implementation. */
+
     int rc;
-    void *pvR0;
-    void *pvR3 = NULL;
+    void *pvR0 = NULL;
     PRTR0MEMOBJOS2 pMemToMapOs2 = (PRTR0MEMOBJOS2)pMemToMap;
     switch (pMemToMapOs2->Core.enmType)
@@ -315 +314 @@
         case RTR0MEMOBJTYPE_PHYS:
             pvR0 = pMemToMapOs2->Core.pv;
+            if (!pvR0)
+            {
+                /* no ring-0 mapping, so allocate a mapping in the process. */
+                AssertMsgReturn(uAlignment == PAGE_SIZE, ("%#zx\n", uAlignment), VERR_NOT_SUPPORTED);
+                AssertMsgReturn(fProt & RTMEM_PROT_WRITE, ("%#x\n", fProt), VERR_NOT_SUPPORTED);
+                Assert(!pMemToMapOs2->Core.u.Phys.fAllocated);
+                ULONG ulPhys = pMemToMapOs2->Core.u.Phys.PhysBase;
+                rc = KernVMAlloc(pMemToMapOs2->Core.cb, VMDHA_PHYS/* | VMDHA_SHARED?*/, &pvR0, (PPVOID)&ulPhys, NULL);
+                if (rc)
+                    return RTErrConvertFromOS2(rc);
+                pMemToMapOs2->Core.pv = pvR0;
+            }
+            break;
+
+        case RTR0MEMOBJTYPE_LOCK:
+            if (pMemToMapOs2->Core.u.Lock.R0Process != NIL_RTR0PROCESS)
+                return VERR_NOT_SUPPORTED; /** @todo implement this... */
+            pvR0 = pMemToMapOs2->Core.pv;
+            break;
+
+        case RTR0MEMOBJTYPE_RES_VIRT:
+        case RTR0MEMOBJTYPE_MAPPING:
+        default:
+            AssertMsgFailed(("enmType=%d\n", pMemToMapOs2->Core.enmType));
+            return VERR_INTERNAL_ERROR;
+    }
+
+    /*
+     * Create a dummy mapping object for it.
+     *
+     * All mappings are read/write/execute in OS/2 and there isn't 
+     * any cache options, so sharing is ok. And the main memory object
+     * isn't actually freed until all the mappings have been freed up
+     * (reference counting).
+     */
+    PRTR0MEMOBJOS2 pMemOs2 = (PRTR0MEMOBJOS2)rtR0MemObjNew(RT_OFFSETOF(RTR0MEMOBJOS2, Lock), RTR0MEMOBJTYPE_MAPPING, pvR0, pMemToMapOs2->Core.cb);
+    if (pMemOs2)
+    {
+        pMemOs2->Core.u.Mapping.R0Process = NIL_RTR0PROCESS;
+        *ppMem = &pMemOs2->Core;
+        return VINF_SUCCESS;
+    }
+    return VERR_NO_MEMORY;
+}
+
+
+int rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ pMemToMap, void *pvFixed, size_t uAlignment, unsigned fProt, RTR0PROCESS R0Process)
+{
+    AssertMsgReturn(R0Process == RTR0ProcHandleSelf(), ("%p != %p\n", R0Process, RTR0ProcHandleSelf()), VERR_NOT_SUPPORTED);
+    AssertMsgReturn(pvFixed == (void *)-1, ("%p\n", pvFixed), VERR_NOT_SUPPORTED);
+
+    int rc;
+    void *pvR0;
+    void *pvR3 = NULL;
+    PRTR0MEMOBJOS2 pMemToMapOs2 = (PRTR0MEMOBJOS2)pMemToMap;
+    switch (pMemToMapOs2->Core.enmType)
+    {
+        /*
+         * These has kernel mappings.
+         */
+        case RTR0MEMOBJTYPE_PAGE:
+        case RTR0MEMOBJTYPE_LOW:
+        case RTR0MEMOBJTYPE_CONT:
+            pvR0 = pMemToMapOs2->Core.pv;
+            break;
+
+        case RTR0MEMOBJTYPE_PHYS:
+            pvR0 = pMemToMapOs2->Core.pv;
+#if 0/* this is wrong. */
             if (!pvR0)
             {
@@ -327 +395 @@
             }
             break;
+#endif 
+            return VERR_NOT_SUPPORTED;
 
         case RTR0MEMOBJTYPE_LOCK:
@@ -364 +434 @@
     if (pMemOs2)
     {
-Assert(pMemOs2->Core.pv == pvR3);
+        Assert(pMemOs2->Core.pv == pvR3);
         pMemOs2->Core.u.Mapping.R0Process = R0Process;
         *ppMem = &pMemOs2->Core;