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

Timestamp:

Apr 12, 2019 1:20:50 PM (6 years ago)

Author:

vboxsync

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

130012

Message:

IPRT: Started adding a RTR0MemObjMapUserEx function that takes offSub and cbSub. bugref:9217

Location:

trunk/src/VBox/Runtime/r0drv

Files:

• darwin/memobj-r0drv-darwin.cpp (modified) (6 diffs)
• freebsd/memobj-r0drv-freebsd.c (modified) (4 diffs)
• haiku/memobj-r0drv-haiku.c (modified) (2 diffs)
• linux/memobj-r0drv-linux.c (modified) (2 diffs)
• memobj-r0drv.cpp (modified) (4 diffs)
• netbsd/memobj-r0drv-netbsd.c (modified) (1 diff)
• nt/memobj-r0drv-nt.cpp (modified) (1 diff)
• os2/memobj-r0drv-os2.cpp (modified) (2 diffs)
• solaris/memobj-r0drv-solaris.c (modified) (2 diffs)

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

@@ -893 +893 @@
     if (uAlignment > PAGE_SIZE)
         return VERR_NOT_SUPPORTED;
+    Assert(!offSub || cbSub);
 
     IPRT_DARWIN_SAVE_EFL_AC();
@@ -959 +960 @@
                          */
                         PRTR0MEMOBJDARWIN pMemDarwin = (PRTR0MEMOBJDARWIN)rtR0MemObjNew(sizeof(*pMemDarwin), RTR0MEMOBJTYPE_MAPPING,
-                                                                                        pv, cbSub);
+                                                                                        pv, cbSub ? cbSub : pMemToMap->cb);
                         if (pMemDarwin)
                         {
@@ -995 +996 @@
 
 DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ pMemToMap, RTR3PTR R3PtrFixed, size_t uAlignment,
-                                        unsigned fProt, RTR0PROCESS R0Process)
+                                        unsigned fProt, RTR0PROCESS R0Process, size_t offSub, size_t cbSub)
 {
     RT_NOREF(fProt);
@@ -1005 +1006 @@
     if (uAlignment > PAGE_SIZE)
         return VERR_NOT_SUPPORTED;
+    Assert(!offSub || cbSub);
 
     IPRT_DARWIN_SAVE_EFL_AC();
@@ -1019 +1021 @@
                                                                               0,
                                                                               kIOMapAnywhere | kIOMapDefaultCache,
-                                                                              0 /* offset */,
-                                                                              0 /* length */);
+                                                                              offSub,
+                                                                              cbSub);
 #else
         IOMemoryMap *pMemMap = pMemToMapDarwin->pMemDesc->map((task_t)R0Process,
                                                               0,
-                                                              kIOMapAnywhere | kIOMapDefaultCache);
+                                                              kIOMapAnywhere | kIOMapDefaultCache,
+                                                              offSub,
+                                                              cbSub);
 #endif
         if (pMemMap)
@@ -1036 +1040 @@
                  */
                 PRTR0MEMOBJDARWIN pMemDarwin = (PRTR0MEMOBJDARWIN)rtR0MemObjNew(sizeof(*pMemDarwin), RTR0MEMOBJTYPE_MAPPING,
-                                                                                pv, pMemToMapDarwin->Core.cb);
+                                                                                pv, cbSub ? cbSub : pMemToMap->cb);
                 if (pMemDarwin)
                 {

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

@@ -651 +651 @@
     if (uAlignment > PAGE_SIZE)
         return VERR_NOT_SUPPORTED;
+    Assert(!offSub || cbSub);
 
     int                rc;
@@ -711 +712 @@
 
 DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ pMemToMap, RTR3PTR R3PtrFixed, size_t uAlignment,
-                                        unsigned fProt, RTR0PROCESS R0Process)
+                                        unsigned fProt, RTR0PROCESS R0Process, size_t offSub, size_t cbSub)
 {
     /*
@@ -719 +720 @@
     if (uAlignment > PAGE_SIZE)
         return VERR_NOT_SUPPORTED;
+    Assert(!offSub || cbSub);
 
     int                rc;
@@ -748 +750 @@
         AddrR3 = (vm_offset_t)R3PtrFixed;
 
+    if (cbSub == 0)
+        cbSub = pMemToMap->cb - offSub;
+
     /* Insert the pObject in the map. */
     vm_object_reference(pMemToMapFreeBSD->pObject);
     rc = vm_map_find(pProcMap,              /* Map to insert the object in */
                      pMemToMapFreeBSD->pObject, /* Object to map */
-                     0,                     /* Start offset in the object */
+                     offSub,                /* Start offset in the object */
                      &AddrR3,               /* Start address IN/OUT */
-                     pMemToMap->cb,         /* Size of the mapping */
+                     cbSub,                 /* Size of the mapping */
 #if __FreeBSD_version >= 1000055
                      0,                     /* Upper bound of the mapping */

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

@@ -478 +478 @@
 
 int rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ pMemToMap, RTR3PTR R3PtrFixed, size_t uAlignment,
-                            unsigned fProt, RTR0PROCESS R0Process)
+                            unsigned fProt, RTR0PROCESS R0Process, size_t offSub, size_t cbSub)
 {
 #if 0
@@ -487 +487 @@
     AssertMsgReturn(R3PtrFixed == (RTR3PTR)-1, ("%p\n", R3PtrFixed), VERR_NOT_SUPPORTED);
     if (uAlignment > PAGE_SIZE)
-    return VERR_NOT_SUPPORTED;
+        return VERR_NOT_SUPPORTED;
+    AssertMsgReturn(!offSub && !cbSub, ("%#zx %#zx\n", offSub, cbSub), VERR_NOT_SUPPORTED); /** @todo implement sub maps */
 
     int                rc;

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

@@ -1530 +1530 @@
 
 
-DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ pMemToMap, RTR3PTR R3PtrFixed,
-                                        size_t uAlignment, unsigned fProt, RTR0PROCESS R0Process)
+DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ pMemToMap, RTR3PTR R3PtrFixed, size_t uAlignment,
+                                        unsigned fProt, RTR0PROCESS R0Process, size_t offSub, size_t cbSub)
 {
     struct task_struct *pTask        = rtR0ProcessToLinuxTask(R0Process);
@@ -1550 +1550 @@
     if (uAlignment > PAGE_SIZE)
         return VERR_NOT_SUPPORTED;
+    AssertMsgReturn(!offSub && !cbSub, ("%#zx %#zx\n", offSub, cbSub), VERR_NOT_SUPPORTED); /** @todo implement sub maps */
 
 #ifdef VBOX_USE_PAE_HACK

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

@@ -730 +730 @@
                                    size_t uAlignment, unsigned fProt, RTR0PROCESS R0Process, const char *pszTag)
 {
+    return RTR0MemObjMapUserExTag(pMemObj, MemObjToMap, R3PtrFixed, uAlignment, fProt, R0Process, 0, 0, pszTag);
+}
+RT_EXPORT_SYMBOL(RTR0MemObjMapUserTag);
+
+
+RTR0DECL(int) RTR0MemObjMapUserExTag(PRTR0MEMOBJ pMemObj, RTR0MEMOBJ MemObjToMap, RTR3PTR R3PtrFixed, size_t uAlignment,
+                                     unsigned fProt, RTR0PROCESS R0Process, size_t offSub, size_t cbSub, const char *pszTag)
+{
     /* sanity checks. */
     PRTR0MEMOBJINTERNAL pMemToMap;
@@ -749 +757 @@
     AssertReturn(fProt != RTMEM_PROT_NONE, VERR_INVALID_PARAMETER);
     AssertReturn(!(fProt & ~(RTMEM_PROT_READ | RTMEM_PROT_WRITE | RTMEM_PROT_EXEC)), VERR_INVALID_PARAMETER);
+    AssertReturn(!(offSub & PAGE_OFFSET_MASK), VERR_INVALID_PARAMETER);
+    AssertReturn(offSub < pMemToMap->cb, VERR_INVALID_PARAMETER);
+    AssertReturn(!(cbSub & PAGE_OFFSET_MASK), VERR_INVALID_PARAMETER);
+    AssertReturn(cbSub <= pMemToMap->cb, VERR_INVALID_PARAMETER);
+    AssertReturn((!offSub && !cbSub) || (offSub + cbSub) <= pMemToMap->cb, VERR_INVALID_PARAMETER);
     if (R0Process == NIL_RTR0PROCESS)
         R0Process = RTR0ProcHandleSelf();
@@ -755 +768 @@
     RT_NOREF_PV(pszTag);
 
+    /* adjust the request to simplify the native code. */
+    if (offSub == 0 && cbSub == pMemToMap->cb)
+        cbSub = 0;
+
     /* do the mapping. */
-    rc = rtR0MemObjNativeMapUser(&pNew, pMemToMap, R3PtrFixed, uAlignment, fProt, R0Process);
+    rc = rtR0MemObjNativeMapUser(&pNew, pMemToMap, R3PtrFixed, uAlignment, fProt, R0Process, offSub, cbSub);
     if (RT_SUCCESS(rc))
     {
@@ -776 +793 @@
     return rc;
 }
-RT_EXPORT_SYMBOL(RTR0MemObjMapUserTag);
+RT_EXPORT_SYMBOL(RTR0MemObjMapUserExTag);
 
 

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

@@ -499 +499 @@
 
 DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ pMemToMap, RTR3PTR R3PtrFixed, size_t uAlignment,
-                                        unsigned fProt, RTR0PROCESS R0Process)
+                                        unsigned fProt, RTR0PROCESS R0Process, size_t offSub, size_t cbSub)
 {
     printf("NativeMapUser\n");

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

@@ -835 +835 @@
 
 
-DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ pMemToMap, RTR3PTR R3PtrFixed,
-                                        size_t uAlignment, unsigned fProt, RTR0PROCESS R0Process)
+DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ pMemToMap, RTR3PTR R3PtrFixed, size_t uAlignment,
+                                        unsigned fProt, RTR0PROCESS R0Process, size_t offSub, size_t cbSub)
 {
     AssertReturn(R0Process == RTR0ProcHandleSelf(), VERR_NOT_SUPPORTED);
+    AssertMsgReturn(!offSub && !cbSub, ("%#zx %#zx\n", offSub, cbSub), VERR_NOT_SUPPORTED); /** @todo implement sub maps */
     return rtR0MemObjNtMap(ppMem, pMemToMap, (void *)R3PtrFixed, uAlignment, fProt, R0Process);
 }

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

@@ -428 +428 @@
 
 
-DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ pMemToMap, RTR3PTR R3PtrFixed, size_t uAlignment, unsigned fProt, RTR0PROCESS R0Process)
+DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ pMemToMap, RTR3PTR R3PtrFixed, size_t uAlignment,
+                                        unsigned fProt, RTR0PROCESS R0Process, size_t offSub, size_t cbSub)
 {
     AssertMsgReturn(R0Process == RTR0ProcHandleSelf(), ("%p != %p\n", R0Process, RTR0ProcHandleSelf()), VERR_NOT_SUPPORTED);
@@ -434 +435 @@
     if (uAlignment > PAGE_SIZE)
         return VERR_NOT_SUPPORTED;
+    AssertMsgReturn(!offSub && !cbSub, ("%#zx %#zx\n", offSub, cbSub), VERR_NOT_SUPPORTED); /** @todo implement sub maps */
 
     int rc;

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

@@ -1012 +1012 @@
 
 DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, PRTR0MEMOBJINTERNAL pMemToMap, RTR3PTR R3PtrFixed,
-                                        size_t uAlignment, unsigned fProt, RTR0PROCESS R0Process)
+                                        size_t uAlignment, unsigned fProt, RTR0PROCESS R0Process, size_t offSub, size_t cbSub)
 {
     /*
@@ -1021 +1021 @@
     if (uAlignment != PAGE_SIZE)
         return VERR_NOT_SUPPORTED;
+    AssertMsgReturn(!offSub && !cbSub, ("%#zx %#zx\n", offSub, cbSub), VERR_NOT_SUPPORTED); /** @todo implement sub maps */
 
     /*