Changeset 21268 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib

Timestamp:

Jul 6, 2009 6:35:30 PM (15 years ago)

Author:

vboxsync

Message:

HGCMInternal.cpp,SysHlp.cpp: use the kernel/user mode indicator.

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

• HGCMInternal.cpp (modified) (4 diffs)
• SysHlp.cpp (modified) (6 diffs)
• SysHlp.h (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp

@@ -169 +169 @@
                 switch (pParm->type)
                 {
+                case VMMDevHGCMParmType_32bit:
+                case VMMDevHGCMParmType_64bit:
+                    break;
+
+                case VMMDevHGCMParmType_PhysAddr:
+                    if ((fFlags & VBGLR0_HGCMCALL_F_MODE_MASK) == VBGLR0_HGCMCALL_F_USER)
+                        rc = VERR_INVALID_PARAMETER;
+                    break;
+
                 case VMMDevHGCMParmType_LinAddr_Locked_In:
-                    pParm->type = VMMDevHGCMParmType_LinAddr_In;
+                    if ((fFlags & VBGLR0_HGCMCALL_F_MODE_MASK) == VBGLR0_HGCMCALL_F_USER)
+                        rc = VERR_INVALID_PARAMETER;
+                    else
+                        pParm->type = VMMDevHGCMParmType_LinAddr_In;
                     break;
                 case VMMDevHGCMParmType_LinAddr_Locked_Out:
-                    pParm->type = VMMDevHGCMParmType_LinAddr_Out;
+                    if ((fFlags & VBGLR0_HGCMCALL_F_MODE_MASK) == VBGLR0_HGCMCALL_F_USER)
+                        rc = VERR_INVALID_PARAMETER;
+                    else
+                        pParm->type = VMMDevHGCMParmType_LinAddr_Out;
                     break;
                 case VMMDevHGCMParmType_LinAddr_Locked:
-                    pParm->type = VMMDevHGCMParmType_LinAddr;
+                    if ((fFlags & VBGLR0_HGCMCALL_F_MODE_MASK) == VBGLR0_HGCMCALL_F_USER)
+                        rc = VERR_INVALID_PARAMETER;
+                    else
+                        pParm->type = VMMDevHGCMParmType_LinAddr;
                     break;
 
@@ -190 +208 @@
                        These kind of problems actually applies to some patched linux kernels too, including older
                        fedora releases. (The patch is the infamous 4G/4G patch, aka 4g4g, by Ingo Molnar.) */
-                    rc = vbglLockLinear (&apvCtx[iParm], (void *)pParm->u.Pointer.u.linearAddr, pParm->u.Pointer.size, (pParm->type == VMMDevHGCMParmType_LinAddr_In) ? false : true /* write access */);
-                    break;
+                    rc = vbglLockLinear (&apvCtx[iParm], (void *)pParm->u.Pointer.u.linearAddr, pParm->u.Pointer.size,
+                                         (pParm->type == VMMDevHGCMParmType_LinAddr_In) ? false : true /* write access */,
+                                         fFlags);
+                    break;
+
                 default:
-                    /* make gcc happy */
+                    rc = VERR_INVALID_PARAMETER;
                     break;
                 }
@@ -333 +354 @@
                 switch (pParm->type)
                 {
+                case VMMDevHGCMParmType_32bit:
+                case VMMDevHGCMParmType_64bit:
+                    break;
+
+                case VMMDevHGCMParmType_PhysAddr:
+                    if ((fFlags & VBGLR0_HGCMCALL_F_MODE_MASK) == VBGLR0_HGCMCALL_F_USER)
+                        rc = VERR_INVALID_PARAMETER;
+                    break;
+
                 case VMMDevHGCMParmType_LinAddr_Locked_In:
-                    pParm->type = VMMDevHGCMParmType_LinAddr_In;
+                    if ((fFlags & VBGLR0_HGCMCALL_F_MODE_MASK) == VBGLR0_HGCMCALL_F_USER)
+                        rc = VERR_INVALID_PARAMETER;
+                    else
+                        pParm->type = VMMDevHGCMParmType_LinAddr_In;
                     break;
                 case VMMDevHGCMParmType_LinAddr_Locked_Out:
-                    pParm->type = VMMDevHGCMParmType_LinAddr_Out;
+                    if ((fFlags & VBGLR0_HGCMCALL_F_MODE_MASK) == VBGLR0_HGCMCALL_F_USER)
+                        rc = VERR_INVALID_PARAMETER;
+                    else
+                        pParm->type = VMMDevHGCMParmType_LinAddr_Out;
                     break;
                 case VMMDevHGCMParmType_LinAddr_Locked:
-                    pParm->type = VMMDevHGCMParmType_LinAddr;
+                    if ((fFlags & VBGLR0_HGCMCALL_F_MODE_MASK) == VBGLR0_HGCMCALL_F_USER)
+                        rc = VERR_INVALID_PARAMETER;
+                    else
+                        pParm->type = VMMDevHGCMParmType_LinAddr;
                     break;
 
@@ -354 +393 @@
                        These kind of problems actually applies to some patched linux kernels too, including older
                        fedora releases. (The patch is the infamous 4G/4G patch, aka 4g4g, by Ingo Molnar.) */
-                    rc = vbglLockLinear (&apvCtx[iParm], (void *)pParm->u.Pointer.u.linearAddr, pParm->u.Pointer.size, (pParm->type == VMMDevHGCMParmType_LinAddr_In) ? false : true /* write access */);
-                    break;
+                    rc = vbglLockLinear (&apvCtx[iParm], (void *)pParm->u.Pointer.u.linearAddr, pParm->u.Pointer.size,
+                                         (pParm->type == VMMDevHGCMParmType_LinAddr_In) ? false : true /* write access */,
+                                         fFlags);
+                    break;
+
                 default:
-                    /* make gcc happy */
+                    rc = VERR_INVALID_PARAMETER;
                     break;
                 }

trunk/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp

@@ -33 +33 @@
 
 
-int vbglLockLinear (void **ppvCtx, void *pv, uint32_t u32Size, bool fWriteAccess)
+
+/**
+ * Internal worker for locking a range of linear addresses.
+ *
+ * @returns VBox status code.
+ * @param   ppvCtx          Where to store context data.
+ * @param   pv              The start of the range.
+ * @param   u32Size         The size of the range.
+ * @param   fWriteAccess    Lock for read-write (true) or readonly (false).
+ * @param   fFlags          HGCM call flags, VBGLR0_HGCM_F_XXX.
+ */
+int vbglLockLinear (void **ppvCtx, void *pv, uint32_t u32Size, bool fWriteAccess, uint32_t fFlags)
 {
     int rc = VINF_SUCCESS;
@@ -49 +60 @@
     }
 
+    /** @todo just use IPRT here. the extra allocation shouldn't matter much...
+     *        Then we can most all this up one level even. */
 #ifdef RT_OS_WINDOWS
     PMDL pMdl = IoAllocateMdl (pv, u32Size, FALSE, FALSE, NULL);
@@ -62 +75 @@
             /* Calls to MmProbeAndLockPages must be enclosed in a try/except block. */
             MmProbeAndLockPages (pMdl,
+                                 /** @todo (fFlags & VBGLR0_HGCMCALL_F_MODE_MASK) == VBGLR0_HGCMCALL_F_USER? UserMode: KernelMode */
                                  KernelMode,
                                  (fWriteAccess) ? IoModifyAccess : IoReadAccess);
@@ -70 +84 @@
 
             IoFreeMdl (pMdl);
+            /** @todo  */
             rc = VERR_INVALID_PARAMETER;
             AssertMsgFailed(("MmProbeAndLockPages %p %x failed!!\n", pv, u32Size));
@@ -84 +99 @@
      *  end up calling this API.  In practice, Linux R3 does it's own thing
      *  before winding up in the R0 path - which calls this stub API.
+     *
+     * bird: this will soon be obsoleted.
      */
     NOREF(ppvCtx);
     NOREF(pv);
     NOREF(u32Size);
+    NOREF(fFlags);
 
 #else
-    /* Default to IPRT - this ASSUMES that it is USER addresses we're locking. */
-    RTR0MEMOBJ MemObj;
-    rc = RTR0MemObjLockUser(&MemObj, (RTR3PTR)pv, u32Size, NIL_RTR0PROCESS);
+    /*
+     * Lock depending on context.
+     *
+     * Note: We will later use the memory object here to convert the HGCM
+     *       linear buffer paramter into a physical page list. This is why
+     *       we lock both kernel pages on all systems, even those where we
+     *       know they aren't pagable.
+     */
+    RTR0MEMOBJ MemObj = NIL_RTR0MEMOBJ;
+    if ((fFlags & VBGLR0_HGCMCALL_F_MODE_MASK) == VBGLR0_HGCMCALL_F_USER)
+        rc = RTR0MemObjLockUser(&MemObj, (RTR3PTR)pv, u32Size, NIL_RTR0PROCESS);
+    else
+        rc = RTR0MemObjLockKernel(&MemObj, pv, u32Size);
     if (RT_SUCCESS(rc))
         *ppvCtx = MemObj;
@@ -122 +150 @@
 
 #else
-    /* default to IPRT */
     RTR0MEMOBJ MemObj = (RTR0MEMOBJ)pvCtx;
     int rc = RTR0MemObjFree(MemObj, false);

trunk/src/VBox/Additions/common/VBoxGuestLib/SysHlp.h

@@ -69 +69 @@
 } VBGLDRIVER;
 
-int vbglLockLinear (void **ppvCtx, void *pv, uint32_t u32Size, bool fWriteAccess);
+int vbglLockLinear (void **ppvCtx, void *pv, uint32_t u32Size, bool fWriteAccess, uint32_t fFlags);
 void vbglUnlockLinear (void *pvCtx, void *pv, uint32_t u32Size);