Changeset 21285 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Jul 7, 2009 12:53:14 AM (16 years ago)

Author:

vboxsync

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

49622

Message:

SUPDrv: Export the RTR0MemUser/Kernel APIs. (Needed for the tstRTR0MemUserKernel testcase.)

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv.c (modified) (2 diffs)
• SUPDrvIOC.h (modified) (1 diff)
• SUPR0.def (modified) (1 diff)
• linux/Makefile (modified) (1 diff)
• linux/files_vboxdrv (modified) (1 diff)
• win/SUPDrvA-win.asm (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -212 +212 @@
 /*DECLASM(RTHCPHYS) UNWIND_WRAP(RTR0MemObjGetPagePhysAddr)(RTR0MEMOBJ MemObj, size_t iPage); - not necessary */
 DECLASM(int)    UNWIND_WRAP(RTR0MemObjFree)(RTR0MEMOBJ MemObj, bool fFreeMappings);
+DECLASM(int)    UNWIND_WRAP(RTR0MemUserCopyFrom)(void *pvDst, RTR3PTR R3PtrSrc, size_t cb);
+DECLASM(int)    UNWIND_WRAP(RTR0MemUserCopyTo)(RTR3PTR R3PtrDst, void const *pvSrc, size_t cb);
+/* RTR0MemUserIsValidAddr - not necessary */
+/* RTR0MemKernelIsValidAddr - not necessary */
+/* RTR0MemAreKrnlAndUsrDifferent - not necessary */
 /* RTProcSelf             - not necessary */
 /* RTR0ProcHandleSelf     - not necessary */
@@ -368 +373 @@
     { "RTR0MemObjGetPagePhysAddr",              (void *)RTR0MemObjGetPagePhysAddr },
     { "RTR0MemObjFree",                         (void *)UNWIND_WRAP(RTR0MemObjFree) },
+    { "RTR0MemUserCopyFrom",                    (void *)UNWIND_WRAP(RTR0MemUserCopyFrom) },
+    { "RTR0MemUserCopyTo",                      (void *)UNWIND_WRAP(RTR0MemUserCopyTo) },
+    { "RTR0MemUserIsValidAddr",                 (void *)RTR0MemUserIsValidAddr },
+    { "RTR0MemKernelIsValidAddr",               (void *)RTR0MemKernelIsValidAddr },
+    { "RTR0MemAreKrnlAndUsrDifferent",          (void *)RTR0MemAreKrnlAndUsrDifferent },
 /* These don't work yet on linux - use fast mutexes!
     { "RTSemMutexCreate",                       (void *)RTSemMutexCreate },

trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h

@@ -194 +194 @@
  *          - Nothing.
  */
-#define SUPDRV_IOC_VERSION                              0x000e0000
+#define SUPDRV_IOC_VERSION                              0x000e0001
 
 /** SUP_IOCTL_COOKIE. */

trunk/src/VBox/HostDrivers/Support/SUPR0.def

@@ -85 +85 @@
     RTR0MemObjGetPagePhysAddr
     RTR0MemObjFree
+    RTR0MemUserCopyFrom
+    RTR0MemUserCopyTo
+    RTR0MemUserIsValidAddr
+    RTR0MemKernelIsValidAddr
+    RTR0MemAreKrnlAndUsrDifferent
     RTProcSelf
     ; broken - RTSemMutexCreate

trunk/src/VBox/HostDrivers/Support/linux/Makefile

@@ -86 +86 @@
         r0drv/linux/initterm-r0drv-linux.o \
         r0drv/linux/memobj-r0drv-linux.o \
+        r0drv/linux/memuserkernel-r0drv-linux.o \
         r0drv/linux/mp-r0drv-linux.o \
         r0drv/linux/mpnotification-r0drv-linux.o \

trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv

@@ -111 +111 @@
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/initterm-r0drv-linux.c=>r0drv/linux/initterm-r0drv-linux.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c=>r0drv/linux/memobj-r0drv-linux.c \
+    ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/memuserkernel-r0drv-linux.c=>r0drv/linux/memuserkernel-r0drv-linux.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c=>r0drv/linux/mp-r0drv-linux.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c=>r0drv/linux/mpnotification-r0drv-linux.c \

trunk/src/VBox/HostDrivers/Support/win/SUPDrvA-win.asm

@@ -110 +110 @@
 ;NtWrapDyn2DrvFunctionWithAllRegParams  supdrvNtWrap, RTR0MemObjGetPagePhysAddr - not necessary
 NtWrapDyn2DrvFunctionWithAllRegParams  supdrvNtWrap, RTR0MemObjFree
+NtWrapDyn2DrvFunctionWithAllRegParams  supdrvNtWrap, RTR0MemUserCopyFrom
+NtWrapDyn2DrvFunctionWithAllRegParams  supdrvNtWrap, RTR0MemUserCopyTo
+;NtWrapDyn2DrvFunctionWithAllRegParams  supdrvNtWrap, RTR0MemUserIsValidAddr - not necessary
+;NtWrapDyn2DrvFunctionWithAllRegParams  supdrvNtWrap, RTR0MemKernelIsValidAdd - not necessary
+;NtWrapDyn2DrvFunctionWithAllRegParams  supdrvNtWrap, RTR0MemAreKrnlAndUsrDifferent - not necessary
 ;NtWrapDyn2DrvFunctionWithAllRegParams  supdrvNtWrap, RTProcSelf             - not necessary
 ;NtWrapDyn2DrvFunctionWithAllRegParams  supdrvNtWrap, RTR0ProcHandleSelf     - not necessary