Changeset 14332

Timestamp:

11/18/08 23:11:06 (2 months ago)

Author:

vboxsync

Message:

SUPDrv,SUPLib: generic ring-0 service interface.

Files:

• trunk/include/VBox/err.h (modified) (1 diff)
• trunk/include/VBox/sup.h (modified) (5 diffs)
• trunk/src/VBox/HostDrivers/Support/SUPDrv.c (modified) (8 diffs)
• trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h (modified) (4 diffs)
• trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h (modified) (10 diffs)
• trunk/src/VBox/HostDrivers/Support/SUPLib.cpp (modified) (9 diffs)
• trunk/src/VBox/HostDrivers/Support/win/SUPDrvA-win.asm (modified) (1 diff)

trunk/include/VBox/err.h

@@ -1133 +1133 @@
-/** The component factories do not support the requested interface. */
-#define VERR_SUPDRV_INTERFACE_NOT_SUPPORTED         (-3701)
+/** The service module was not found. */
+#define VERR_SUPDRV_SERVICE_NOT_FOUND               (-3702)
-/** @} */
-

trunk/include/VBox/sup.h

@@ -275 +275 @@
-typedef SUPVMMR0REQHDR *PSUPVMMR0REQHDR;
-/** the SUPVMMR0REQHDR::u32Magic value (Ethan Iverson - The Bad Plus). */
-
+    
-
-
@@ -288 +288 @@
-#define SUP_VMMR0_DO_NOP        2
-/** @} */
+
+
+/**
+ * Request for generic FNSUPR0SERVICEREQHANDLER calls.
+ */
+typedef struct SUPR0SERVICEREQHDR
+{
+    /** The magic. (SUPR0SERVICEREQHDR_MAGIC) */
+    uint32_t    u32Magic;
+    /** The size of the request. */
+    uint32_t    cbReq;
+} SUPR0SERVICEREQHDR;
+/** Pointer to a ring-0 service request header. */
+typedef SUPR0SERVICEREQHDR *PSUPR0SERVICEREQHDR;
+/** the SUPVMMR0REQHDR::u32Magic value (Esbjoern Svensson - E.S.P.).  */
+#define SUPR0SERVICEREQHDR_MAGIC    UINT32_C(0x19640416)
-
-
@@ -463 +479 @@
-
-/**
+ * Calls a ring-0 service.
+ *
+ * The operation and the request packet is specific to the service.
+ *
+ * @returns error code specific to uFunction.
+ * @param   pszService  The service name.
+ * @param   cchService  The length of the service name.
+ * @param   uReq        The request number.
+ * @param   u64Arg      Constant argument.
+ * @param   pReqHdr     Pointer to a request header. Optional.
+ *                      This will be copied in and out of kernel space. There currently is a size
+ *                      limit on this, just below 4KB.
+ */
+SUPR3DECL(int) SUPR3CallR0Service(const char *pszService, size_t cchService, uint32_t uOperation, uint64_t u64Arg, PSUPR0SERVICEREQHDR pReqHdr);
+
+/**
- * Queries the paging mode of the host OS.
- *
@@ -626 +658 @@
- * @param   pszFilename     The path to the image file.
- * @param   pszModule       The module name. Max 32 bytes.
+ * @param   ppvImageBase        Where to store the image address.
- */
-SUPR3DECL(int) SUPLoadModule(const char *pszFilename, const char *pszModule, void **ppvImageBase);
+
+/**
+ * Load a module into R0 HC.
+ *
+ * This will verify the file integrity in a similar manner as
+ * SUPR3HardenedVerifyFile before loading it.
+ *
+ * @returns VBox status code.
+ * @param   pszFilename         The path to the image file.
+ * @param   pszModule           The module name. Max 32 bytes.
+ * @param   pszSrvReqHandler    The name of the service request handler entry
+ *                              point. See FNSUPR0SERVICEREQHANDLER.
+ * @param   ppvImageBase        Where to store the image address.
+ */
+SUPR3DECL(int) SUPR3LoadServiceModule(const char *pszFilename, const char *pszModule,
+                                      const char *pszSrvReqHandler, void **ppvImageBase);
-
-/**
@@ -820 +869 @@
-
-
+/**
+ * Service request callback function.
+ *
+ * @returns VBox status code.
+ * @param   pSession    The caller's session.
+ * @param   u64Arg      64-bit integer argument.
+ * @param   pReqHdr     The request header. Input / Output. Optional.
+ */
+typedef DECLCALLBACK(int) FNSUPR0SERVICEREQHANDLER(PSUPDRVSESSION pSession, uint32_t uOperation,
+                                                   uint64_t u64Arg, PSUPR0SERVICEREQHDR pReqHdr);
+/** Pointer to a FNR0SERVICEREQHANDLER(). */
+typedef R0PTRTYPE(FNSUPR0SERVICEREQHANDLER *) PFNSUPR0SERVICEREQHANDLER;
+
+
-/** @defgroup   grp_sup_r0_idc  The IDC Interface
- * @ingroup grp_sup_r0

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

@@ -141 +141 @@
-static int      supdrvLdrAddUsage(PSUPDRVSESSION pSession, PSUPDRVLDRIMAGE pImage);
-static void     supdrvLdrFree(PSUPDRVDEVEXT pDevExt, PSUPDRVLDRIMAGE pImage);
+static int      supdrvIOCtl_CallServiceModule(PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSession, PSUPCALLSERVICE pReq);
-static SUPPAGINGMODE supdrvIOCtl_GetPagingMode(void);
-static SUPGIPMODE supdrvGipDeterminTscMode(PSUPDRVDEVEXT pDevExt);
@@ -160 +161 @@
-DECLASM(int)    supdrvNtWrapModuleInit(PFNRT pfnModuleInit);
-DECLASM(void)   supdrvNtWrapModuleTerm(PFNRT pfnModuleTerm);
+DECLASM(int)    supdrvNtWrapServiceReqHandler(PFNRT pfnServiceReqHandler, PSUPDRVSESSION pSession, uint32_t uOperation, uint64_t u64Arg, PSUPR0SERVICEREQHDR pReqHdr);
-
-DECLASM(int)    UNWIND_WRAP(SUPR0ComponentRegisterFactory)(PSUPDRVSESSION pSession, PCSUPDRVFACTORY pFactory);
@@ -1417 +1419 @@
-        }
-
+        case SUP_CTL_CODE_NO_SIZE(SUP_IOCTL_CALL_SERVICE(0)):
+        {
+            /* validate */
+            PSUPCALLSERVICE pReq = (PSUPCALLSERVICE)pReqHdr;
+            Log4(("SUP_IOCTL_CALL_SERVICE: op=%u in=%u arg=%RX64 p/t=%RTproc/%RTthrd\n",
+                  pReq->u.In.uOperation, pReq->Hdr.cbIn, pReq->u.In.u64Arg, RTProcSelf(), RTThreadNativeSelf()));
+
+            if (pReq->Hdr.cbIn == SUP_IOCTL_CALL_SERVICE_SIZE(0))
+                REQ_CHECK_SIZES_EX(SUP_IOCTL_CALL_SERVICE, SUP_IOCTL_CALL_SERVICE_SIZE_IN(0), SUP_IOCTL_CALL_SERVICE_SIZE_OUT(0));
+            else
+            {
+                PSUPR0SERVICEREQHDR pSrvReq = (PSUPR0SERVICEREQHDR)&pReq->abReqPkt[0];
+                REQ_CHECK_EXPR_FMT(pReq->Hdr.cbIn >= SUP_IOCTL_CALL_SERVICE_SIZE(sizeof(SUPR0SERVICEREQHDR)),
+                                   ("SUP_IOCTL_CALL_SERVICE: cbIn=%#x < %#lx\n", pReq->Hdr.cbIn, SUP_IOCTL_CALL_SERVICE_SIZE(sizeof(SUPR0SERVICEREQHDR))));
+                REQ_CHECK_EXPR(SUP_IOCTL_CALL_SERVICE, pSrvReq->u32Magic == SUPR0SERVICEREQHDR_MAGIC);
+                REQ_CHECK_SIZES_EX(SUP_IOCTL_CALL_SERVICE, SUP_IOCTL_CALL_SERVICE_SIZE_IN(pSrvReq->cbReq), SUP_IOCTL_CALL_SERVICE_SIZE_OUT(pSrvReq->cbReq));
+            }
+            REQ_CHECK_EXPR(SUP_IOCTL_CALL_SERVICE, memchr(pReq->u.In.szName, '\0', sizeof(pReq->u.In.szName)));
+
+            /* execute */
+            pReq->Hdr.rc = supdrvIOCtl_CallServiceModule(pDevExt, pSession, pReq);
+            return 0;
+        }
+
-        default:
-            Log(("Unknown IOCTL %#lx\n", (long)uIOCtl));
@@ -3713 +3739 @@
-    pImage->pfnModuleInit   = NULL;
-    pImage->pfnModuleTerm   = NULL;
+    pImage->pfnServiceReqHandler = NULL;
-    pImage->uState          = SUP_IOCTL_LDR_OPEN;
-    pImage->cUsage          = 1;
@@ -3782 +3809 @@
-        case SUPLDRLOADEP_NOTHING:
-            break;
+
-        case SUPLDRLOADEP_VMMR0:
-            if (    !pReq->u.In.EP.VMMR0.pvVMMR0
@@ -3806 +3834 @@
-            }
-            break;
+
+        case SUPLDRLOADEP_SERVICE:
+            if (!pReq->u.In.EP.Service.pfnServiceReq)
+            {
+                RTSemFastMutexRelease(pDevExt->mtxLdr);
+                Log(("NULL pointer: pfnServiceReq=%p!\n", pReq->u.In.EP.Service.pfnServiceReq));
+                return VERR_INVALID_PARAMETER;
+            }
+            if ((uintptr_t)pReq->u.In.EP.Service.pfnServiceReq  - (uintptr_t)pImage->pvImage >= pReq->u.In.cbImage)
+            {
+                RTSemFastMutexRelease(pDevExt->mtxLdr);
+                Log(("Out of range (%p LB %#x): pfnServiceReq=%p, pvVMMR0EntryFast=%p or pvVMMR0EntryEx=%p is NULL!\n",
+                     pImage->pvImage, pReq->u.In.cbImage, pReq->u.In.EP.Service.pfnServiceReq));
+                return VERR_INVALID_PARAMETER;
+            }
+            if (    pReq->u.In.EP.Service.apvReserved[0] != NIL_RTR0PTR
+                ||  pReq->u.In.EP.Service.apvReserved[1] != NIL_RTR0PTR
+                ||  pReq->u.In.EP.Service.apvReserved[2] != NIL_RTR0PTR)
+            {
+                RTSemFastMutexRelease(pDevExt->mtxLdr);
+                Log(("Out of range (%p LB %#x): apvReserved={%p,%p,%p} MBZ!\n",
+                     pImage->pvImage, pReq->u.In.cbImage,
+                     pReq->u.In.EP.Service.apvReserved[0],
+                     pReq->u.In.EP.Service.apvReserved[1],
+                     pReq->u.In.EP.Service.apvReserved[2]));
+                return VERR_INVALID_PARAMETER;
+            }
+            break;
+
-        default:
-            RTSemFastMutexRelease(pDevExt->mtxLdr);
@@ -3853 +3910 @@
-            rc = supdrvLdrSetR0EP(pDevExt, pReq->u.In.EP.VMMR0.pvVMMR0, pReq->u.In.EP.VMMR0.pvVMMR0EntryInt,
-                                  pReq->u.In.EP.VMMR0.pvVMMR0EntryFast, pReq->u.In.EP.VMMR0.pvVMMR0EntryEx);
+            break;
+        case SUPLDRLOADEP_SERVICE:
+            pImage->pfnServiceReqHandler = pReq->u.In.EP.Service.pfnServiceReq;
+            rc = VINF_SUCCESS;
-            break;
-    }
@@ -4349 +4410 @@
-    pImage->uState = SUP_IOCTL_LDR_FREE;
-    RTMemExecFree(pImage);
+}
+
+
+/**
+ * Implements the service call request.
+ *
+ * @returns VBox status code.
+ * @param   pDevExt         The device extension.
+ * @param   pSession        The calling session.
+ * @param   pReq            The request packet, valid.
+ */
+static int supdrvIOCtl_CallServiceModule(PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSession, PSUPCALLSERVICE pReq)
+{
+#if !defined(RT_OS_WINDOWS) || defined(DEBUG)
+    int rc;
+
+    /*
+     * Find the module first in the module referenced by the calling session.
+     */
+    rc = RTSemFastMutexRequest(pDevExt->mtxLdr);
+    if (RT_SUCCESS(rc))
+    {
+        PFNSUPR0SERVICEREQHANDLER   pfnServiceReqHandler = NULL;
+        PSUPDRVLDRUSAGE             pUsage;
+
+        for (pUsage = pSession->pLdrUsage; pUsage; pUsage = pUsage->pNext)
+            if (    pUsage->pImage->pfnServiceReqHandler
+                &&  !strcmp(pUsage->pImage->szName, pReq->u.In.szName))
+            {
+                pfnServiceReqHandler = pUsage->pImage->pfnServiceReqHandler;
+                break;
+            }
+        RTSemFastMutexRelease(pDevExt->mtxLdr);
+
+        if (pfnServiceReqHandler)
+        {
+            /*
+             * Call it.
+             */
+            if (pReq->Hdr.cbIn == SUP_IOCTL_CALL_SERVICE_SIZE(0))
+#ifdef RT_WITH_W64_UNWIND_HACK
+                rc = supdrvNtWrapServiceReqHandler((PRNRT)pfnServiceReqHandler, pSession, pReq->u.In.uOperation, pReq->u.In.u64Arg, NULL);
+#else
+                rc = pfnServiceReqHandler(pSession, pReq->u.In.uOperation, pReq->u.In.u64Arg, NULL);
+#endif
+            else
+#ifdef RT_WITH_W64_UNWIND_HACK
+                rc = supdrvNtWrapServiceReqHandler((PRNRT)pfnServiceReqHandler, pSession, pReq->u.In.uOperation,
+                                                   pReq->u.In.u64Arg, (PSUPR0SERVICEREQHDR)&pReq->abReqPkt[0]);
+#else
+                rc = pfnServiceReqHandler(pSession, pReq->u.In.uOperation, pReq->u.In.u64Arg, (PSUPR0SERVICEREQHDR)&pReq->abReqPkt[0]);
+#endif
+        }
+        else
+            rc = VERR_SUPDRV_SERVICE_NOT_FOUND;
+    }
+
+    /* log it */
+    if (    RT_FAILURE(rc)
+        &&  rc != VERR_INTERRUPTED
+        &&  rc != VERR_TIMEOUT)
+        Log(("SUP_IOCTL_CALL_SERVICE: rc=%Rrc op=%u out=%u arg=%RX64 p/t=%RTproc/%RTthrd\n",
+             rc, pReq->u.In.uOperation, pReq->Hdr.cbOut, pReq->u.In.u64Arg, RTProcSelf(), RTThreadNativeSelf()));
+    else
+        Log4(("SUP_IOCTL_CALL_SERVICE: rc=%Rrc op=%u out=%u arg=%RX64 p/t=%RTproc/%RTthrd\n",
+              rc, pReq->u.In.uOperation, pReq->Hdr.cbOut, pReq->u.In.u64Arg, RTProcSelf(), RTThreadNativeSelf()));
+    return rc;
+#else  /* RT_OS_WINDOWS && !DEBUG */
+    return VERR_NOT_IMPLEMENTED;
+#endif /* RT_OS_WINDOWS && !DEBUG */
-}
-

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

@@ -182 +182 @@
- * The upper 16-bit is the major version, the the lower the minor version.
- * When incompatible changes are made, the upper major number has to be changed. */
-A0000
+a0001
-
-/** SUP_IOCTL_COOKIE. */
@@ -383 +383 @@
-    SUPLDRLOADEP_NOTHING = 0,
-    SUPLDRLOADEP_VMMR0,
+    SUPLDRLOADEP_SERVICE,
-    SUPLDRLOADEP_32BIT_HACK = 0x7fffffff
-} SUPLDRLOADEP;
@@ -401 +402 @@
-            union
-            {
+                /** SUPLDRLOADEP_VMMR0. */
-                struct
-                {
-                    /** The module handle (i.e. address). */
-
+        
-                    /** Address of VMMR0EntryInt function. */
-
+        
-                    /** Address of VMMR0EntryFast function. */
-
+        
-                    /** Address of VMMR0EntryEx function. */
-
+        
-                } VMMR0;
+                /** SUPLDRLOADEP_SERVICE. */
+                struct
+                {
+                    /** The service request handler.
+                     * (PFNR0SERVICEREQHANDLER isn't defined yet.) */
+                    RTR0PTR                 pfnServiceReq;
+                    /** Reserved, must be NIL. */
+                    RTR0PTR                 apvReserved[3];
+                } Service;
-            }               EP;
-            /** Address. */
@@ -844 +855 @@
-
-
+/** @name SUP_IOCTL_CALL_SERVICE
+ * Call the a ring-0 service.
+ *
+ * @todo    Might have to convert this to a big request, just like
+ *          SUP_IOCTL_CALL_VMMR0
+ * @{
+ */
+#define SUP_IOCTL_CALL_SERVICE(cbReq)                   SUP_CTL_CODE_SIZE(22, SUP_IOCTL_CALL_SERVICE_SIZE(cbReq))
+#define SUP_IOCTL_CALL_SERVICE_SIZE(cbReq)              RT_UOFFSETOF(SUPCALLSERVICE, abReqPkt[cbReq])
+#define SUP_IOCTL_CALL_SERVICE_SIZE_IN(cbReq)           SUP_IOCTL_CALL_SERVICE_SIZE(cbReq)
+#define SUP_IOCTL_CALL_SERVICE_SIZE_OUT(cbReq)          SUP_IOCTL_CALL_SERVICE_SIZE(cbReq)
+typedef struct SUPCALLSERVICE
+{
+    /** The header. */
+    SUPREQHDR               Hdr;
+    union
+    {
+        struct
+        {
+            /** The service name. */
+            char            szName[28];
+            /** Which operation to execute. */
+            uint32_t        uOperation;
+            /** Argument to use when no request packet is supplied. */
+            uint64_t        u64Arg;
+        } In;
+    } u;
+    /** The request packet passed to SUP. */
+    uint8_t                 abReqPkt[1];
+} SUPCALLSERVICE, *PSUPCALLSERVICE;
+/** @} */
+
+
-#pragma pack()                          /* paranoia */
-

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

@@ -347 +347 @@
-#define SUPDRV_PATCH_CODE_SIZE  0x50
-    /** Patch code. */
-
+        
-    /** Changed IDT entry (for parnoid UnpatchIdt()). */
-
+        
-    /** Saved IDT entry. */
-
+        
-    /** Pointer to the IDT.
-     * We ASSUME the IDT is not re(al)located after bootup and use this as key
@@ -360 +360 @@
-     * the(se) page(s), but we'll find that out soon enough in VBOX_STRICT mode.
-     */
-
+        
-    /** Pointer to the IDT entry. */
-
+        
-    /** Usage counter. */
-
+        
-    /** The offset into auCode of the VMMR0Entry fixup. */
-
+        
-    /** The offset into auCode of the stub function. */
-
+        
-    /** Pointer to the next patch. */
-    struct SUPDRVPATCH * volatile pNext;
@@ -381 +381 @@
-    struct SUPDRVPATCHUSAGE * volatile pNext;
-    /** The patch this usage applies to. */
-
+            
-    /** Usage count. */
-
+            
-} SUPDRVPATCHUSAGE, *PSUPDRVPATCHUSAGE;
-
@@ -418 +418 @@
-{
-    /** The memory object handle. */
-
+            
-    /** The ring-3 mapping memory object handle. */
-
+            
-    /** Type of memory. */
-
+            
-} SUPDRVMEMREF, *PSUPDRVMEMREF;
-
@@ -432 +432 @@
-{
-    /** Pointer to the next bundle. */
-
+ 
-    /** Referenced memory. */
-
+            
-    /** Number of entries used. */
-    uint32_t volatile   cUsed;
@@ -448 +448 @@
-    struct SUPDRVLDRIMAGE * volatile pNext;
-    /** Pointer to the image. */
-
+            
-    /** Pointer to the optional module initialization callback. */
-
+            
-    /** Pointer to the optional module termination callback. */
-
+
+
+
-    /** Size of the image. */
-
+            
-    /** The offset of the symbol table. */
-
+            
-    /** The number of entries in the symbol table. */
-
+            
-    /** The offset of the string table. */
-
+            
-    /** Size of the string table. */
-
+            
-    /** The ldr image state. (IOCtl code of last opration.) */
-
+            
-    /** Usage count. */
-
+            
-    /** Image name. */
-
+            
-} SUPDRVLDRIMAGE, *PSUPDRVLDRIMAGE;
-
@@ -478 +480 @@
-    struct SUPDRVLDRUSAGE * volatile pNext;
-    /** The image. */
-
+            
-    /** Load count. */
-
+            
-} SUPDRVLDRUSAGE, *PSUPDRVLDRUSAGE;
-
@@ -490 +492 @@
-{
-    /** Pointer to the next registration. */
-
+    
-    /** Pointer to the registered factory. */
-
+    
-    /** The session owning the factory.
-     * Used for deregistration and session cleanup. */
-
+    
-    /** Length of the name. */
-
+    
-} SUPDRVFACTORYREG;
-/** Pointer to a component factory registration record. */
@@ -558 +560 @@
-{
-    /** Pointer to the device extension. */
-
+    
-    /** Session Cookie. */
-
+    
-
-    /** Load usage records. (protected by SUPDRVDEVEXT::mtxLdr) */
-
+    
-#ifdef VBOX_WITH_IDT_PATCHING
-    /** Patch usage records. (protected by SUPDRVDEVEXT::SpinLock) */
-
+    
-#endif
-    /** The VM associated with the session. */
-
+    
-    /** List of generic usage records. (protected by SUPDRVDEVEXT::SpinLock) */
-
+    
-
-    /** Spinlock protecting the bundles and the GIP members. */
-
+    
-    /** The ring-3 mapping of the GIP (readonly). */
-
+    
-    /** Set if the session is using the GIP. */
-
+    
-    /** Bundle of locked memory objects. */
-
+    
-
-    /** The user id of the session. (Set by the OS part.) */
-
+    
-    /** The group id of the session. (Set by the OS part.) */
-
+    
-    /** The process (id) of the session. */
-
+    
-    /** Which process this session is associated with.
-     * This is NIL_RTR0PROCESS for kernel sessions and valid for user ones. */
-
+    
-#if defined(RT_OS_DARWIN)
-    /** Pointer to the associated org_virtualbox_SupDrvClient object. */
-
+    
-    /** Whether this session has been opened or not. */
-
+    
-#endif
-#if defined(RT_OS_OS2)
-    /** The system file number of this session. */
-
-
+    
+    
-#endif
-#if defined(RT_OS_DARWIN) || defined(RT_OS_OS2) || defined(RT_OS_SOLARIS)
-    /** Pointer to the next session with the same hash. */
-
+    
-#endif
-} SUPDRVSESSION;
@@ -616 +618 @@
-    /** Spinlock to serialize the initialization,
-     * usage counting and destruction of the IDT entry override and objects. */
-
+        
-
-#ifdef VBOX_WITH_IDT_PATCHING
-    /** List of patches. */
-
+        
-    /** List of patches Free. */
-
+        
-#endif
-
-    /** List of registered objects. Protected by the spinlock. */
-
+        
-    /** List of free object usage records. */
-
+        
-
-    /** Global cookie. */
-
+        
-
-    /** The IDT entry number.
-     * Only valid if pIdtPatches is set. */
-
+        
-
-    /** Loader mutex.
-     * This protects pvVMMR0, pvVMMR0Entry, pImages and SUPDRVSESSION::pLdrUsage. */
-
+        
-
-    /** VMM Module 'handle'.
-     * 0 if the code VMM isn't loaded and Idt are nops. */
-
+        
-    /** VMMR0EntryInt() pointer. */
-
+      
-    /** VMMR0EntryFast() pointer. */
-
+     
-    /** VMMR0EntryEx() pointer. */
-
+      
-
-    /** Linked list of loaded code. */
-
+       
-
-    /** GIP mutex.
-     * Any changes to any of the GIP members requires ownership of this mutex,
-     * except on driver init and termination. */
-
+        
-    /** Pointer to the Global Info Page (GIP). */
-
+        
-    /** The physical address of the GIP. */
-
+        
-    /** Number of processes using the GIP.
-     * (The updates are suspend while cGipUsers is 0.)*/
-
+        
-    /** The ring-0 memory object handle for the GIP page. */
-
+        
-    /** The GIP timer handle. */
-
+        
-    /** If non-zero we've successfully called RTTimerRequestSystemGranularity(). */
-
+        
-    /** The CPU id of the GIP master.
-     * This CPU is responsible for the updating the common GIP data. */
-
+        
-
-#ifdef RT_OS_WINDOWS
-    /* Callback object returned by ExCreateCallback. */
-
+        
-    /* Callback handle returned by ExRegisterCallback. */
-
+        
-#endif
-
-    /** Component factory mutex.
-     * This protects pComponentFactoryHead and component factory querying. */
-
+        
-    /** The head of the list of registered component factories. */
-
+        
-} SUPDRVDEVEXT;
-

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -151 +151 @@
-*******************************************************************************/
-static int supInitFake(PSUPDRVSESSION *ppSession);
-
+const char *pszSrvReqHandler, 
-#ifdef VBOX_WITH_IDT_PATCHING
-static int supInstallIDTE(void);
@@ -679 +679 @@
-
-
+SUPR3DECL(int) SUPR3CallR0Service(const char *pszService, size_t cchService, uint32_t uOperation, uint64_t u64Arg, PSUPR0SERVICEREQHDR pReqHdr)
+{
+    AssertReturn(cchService < RT_SIZEOFMEMB(SUPCALLSERVICE, u.In.szName), VERR_INVALID_PARAMETER);
+    Assert(strlen(pszService) == cchService);
+
+    /* fake */
+    if (RT_UNLIKELY(g_u32FakeMode))
+        return VERR_NOT_SUPPORTED;
+
+    int rc;
+    if (!pReqHdr)
+    {
+        /* no data. */
+        SUPCALLSERVICE Req;
+        Req.Hdr.u32Cookie = g_u32Cookie;
+        Req.Hdr.u32SessionCookie = g_u32SessionCookie;
+        Req.Hdr.cbIn = SUP_IOCTL_CALL_SERVICE_SIZE_IN(0);
+        Req.Hdr.cbOut = SUP_IOCTL_CALL_SERVICE_SIZE_OUT(0);
+        Req.Hdr.fFlags = SUPREQHDR_FLAGS_DEFAULT;
+        Req.Hdr.rc = VERR_INTERNAL_ERROR;
+        memcpy(Req.u.In.szName, pszService, cchService);
+        Req.u.In.szName[cchService] = '\0';
+        Req.u.In.uOperation = uOperation;
+        Req.u.In.u64Arg = u64Arg;
+        rc = suplibOsIOCtl(&g_supLibData, SUP_IOCTL_CALL_SERVICE(0), &Req, SUP_IOCTL_CALL_SERVICE_SIZE(0));
+        if (RT_SUCCESS(rc))
+            rc = Req.Hdr.rc;
+    }
+    else if (SUP_IOCTL_CALL_SERVICE_SIZE(pReqHdr->cbReq) < _4K) /* FreeBSD won't copy more than 4K. */
+    {
+        AssertPtrReturn(pReqHdr, VERR_INVALID_POINTER);
+        AssertReturn(pReqHdr->u32Magic == SUPR0SERVICEREQHDR_MAGIC, VERR_INVALID_MAGIC);
+        const size_t cbReq = pReqHdr->cbReq;
+
+        PSUPCALLSERVICE pReq = (PSUPCALLSERVICE)alloca(SUP_IOCTL_CALL_SERVICE_SIZE(cbReq));
+        pReq->Hdr.u32Cookie = g_u32Cookie;
+        pReq->Hdr.u32SessionCookie = g_u32SessionCookie;
+        pReq->Hdr.cbIn = SUP_IOCTL_CALL_SERVICE_SIZE_IN(cbReq);
+        pReq->Hdr.cbOut = SUP_IOCTL_CALL_SERVICE_SIZE_OUT(cbReq);
+        pReq->Hdr.fFlags = SUPREQHDR_FLAGS_DEFAULT;
+        pReq->Hdr.rc = VERR_INTERNAL_ERROR;
+        memcpy(pReq->u.In.szName, pszService, cchService);
+        pReq->u.In.szName[cchService] = '\0';
+        pReq->u.In.uOperation = uOperation;
+        pReq->u.In.u64Arg = u64Arg;
+        memcpy(&pReq->abReqPkt[0], pReqHdr, cbReq);
+        rc = suplibOsIOCtl(&g_supLibData, SUP_IOCTL_CALL_SERVICE(cbReq), pReq, SUP_IOCTL_CALL_SERVICE_SIZE(cbReq));
+        if (RT_SUCCESS(rc))
+            rc = pReq->Hdr.rc;
+        memcpy(pReqHdr, &pReq->abReqPkt[0], cbReq);
+    }
+    else /** @todo may have to remove the size limits one this request... */
+        AssertMsgFailedReturn(("cbReq=%#x\n", pReqHdr->cbReq), VERR_INTERNAL_ERROR);
+    return rc;
+}
+
+
-SUPR3DECL(int) SUPPageAlloc(size_t cPages, void **ppvPages)
-{
@@ -1180 +1237 @@
-         * If it's VMMR0.r0 we need to install the IDTE.
-         */
-
+NULL, 
-#ifdef VBOX_WITH_IDT_PATCHING
-        if (    RT_SUCCESS(rc)
@@ -1193 +1250 @@
-    else
-        LogRel(("SUPLoadModule: Verification of \"%s\" failed, rc=%Rrc\n", rc));
+    return rc;
+}
+
+
+SUPR3DECL(int) SUPR3LoadServiceModule(const char *pszFilename, const char *pszModule,
+                                      const char *pszSrvReqHandler, void **ppvImageBase)
+{
+    int rc = VINF_SUCCESS;
+    AssertPtrReturn(pszSrvReqHandler, VERR_INVALID_PARAMETER);
+
+#ifdef VBOX_WITH_HARDENING
+    /*
+     * Check that the module can be trusted.
+     */
+    rc = supR3HardenedVerifyFile(pszFilename, false /* fFatal */);
+#endif
+    if (RT_SUCCESS(rc))
+    {
+        /*
+         * Load the module.
+         * If it's VMMR0.r0 we need to install the IDTE.
+         */
+        rc = supLoadModule(pszFilename, pszModule, pszSrvReqHandler, ppvImageBase);
+    }
+    else
+        LogRel(("SUPR3LoadServiceModule: Verification of \"%s\" failed, rc=%Rrc\n", rc));
-    return rc;
-}
@@ -1569 +1652 @@
- * @param   pszFilename     Name of the VMMR0 image file
- */
-
+const char *pszSrvReqHandler, 
-{
-    /*
@@ -1580 +1663 @@
-
-    const bool fIsVMMR0 = !strcmp(pszModule, "VMMR0.r0");
+    AssertReturn(!pszSrvReqHandler || !fIsVMMR0, VERR_INTERNAL_ERROR);
-    *ppvImageBase = NULL;
-
@@ -1649 +1733 @@
-                    RTUINTPTR VMMR0EntryFast = 0;
-                    RTUINTPTR VMMR0EntryEx = 0;
+                    RTUINTPTR SrvReqHandler = 0;
-                    RTUINTPTR ModuleInit = 0;
-                    RTUINTPTR ModuleTerm = 0;
@@ -1659 +1744 @@
-                            rc = RTLdrGetSymbolEx(hLdrMod, &pLoadReq->u.In.achImage[0], (uintptr_t)OpenReq.u.Out.pvImageBase, "VMMR0EntryEx", &VMMR0EntryEx);
-                    }
+                    else if (pszSrvReqHandler)
+                        rc = RTLdrGetSymbolEx(hLdrMod, &pLoadReq->u.In.achImage[0], (uintptr_t)OpenReq.u.Out.pvImageBase, pszSrvReqHandler, &SrvReqHandler);
-                    if (RT_SUCCESS(rc))
-                    {
@@ -1704 +1791 @@
-                                pLoadReq->u.In.EP.VMMR0.pvVMMR0EntryFast= (RTR0PTR)VMMR0EntryFast;
-                                pLoadReq->u.In.EP.VMMR0.pvVMMR0EntryEx  = (RTR0PTR)VMMR0EntryEx;
+                            }
+                            else if (pszSrvReqHandler)
+                            {
+                                pLoadReq->u.In.eEPType                = SUPLDRLOADEP_SERVICE;
+                                pLoadReq->u.In.EP.Service.pfnServiceReq = (RTR0PTR)SrvReqHandler;
+                                pLoadReq->u.In.EP.Service.apvReserved[0] = NIL_RTR0PTR;
+                                pLoadReq->u.In.EP.Service.apvReserved[1] = NIL_RTR0PTR;
+                                pLoadReq->u.In.EP.Service.apvReserved[2] = NIL_RTR0PTR;
-                            }
-                            else