Changeset 378 in vbox for trunk

Timestamp:

Jan 27, 2007 3:54:16 AM (18 years ago)

Author:

vboxsync

Message:

client/provider stuff (not complete). And some bugfixes.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• Makefile (modified) (1 diff)
• SUPDRV.h (modified) (2 diffs)
• SUPDRVShared.c (modified) (2 diffs)
• darwin/SUPDrv-darwin.cpp (moved) (moved from trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.c ) (14 diffs)

trunk/src/VBox/HostDrivers/Support/Makefile

@@ -182 +182 @@
 VBoxDrv_DEFS          = IN_RT_R0 IN_SUP_R0 USE_NEW_OS_INTERFACE
 VBoxDrv_INCS          = $(VBOX_PATH_SUPPORT)
-VBoxDrv_LIBS          = $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) $(VBOX_GCC_LIBGCC)
+VBoxDrv_LIBS          = $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
 VBoxDrv_LDFLAGS       = -v -Wl,-whyload -Wl,-v -Wl,-whatsloaded
 VBoxDrv_INST          = bin/VBoxDrv.kext/Contents/MacOS/
 VBoxDrv_SOURCES       = \
         $(VBOX_PATH_SUPPORT)/SUPDRVShared.c \
-        $(VBOX_PATH_SUPPORT)/$(BUILD_TARGET)/SUPDrv-$(BUILD_TARGET).c
+        $(VBOX_PATH_SUPPORT)/$(BUILD_TARGET)/SUPDrv-$(BUILD_TARGET).cpp
 
 INSTALLS += VBoxDrv.kext

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

@@ -171 +171 @@
 
 /* dprintf2 - extended logging. */
-#if 0
+#if defined(__DARWIN__)
 # define dprintf2 dprintf
 #else
@@ -547 +547 @@
     PSUPDRVSESSION              pNextHash;
 #endif
+#if defined(__DARWIN__)
+    /** Pointer to the org_virtualbox_SupDrvClient client that's associated with the session. */
+    void                       *pvClient;
+#endif
 } SUPDRVSESSION;
 

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

@@ -1821 +1821 @@
                     *ppvR0 = RTR0MemObjAddress(Mem.MemObj);
                 *ppvR3 = RTR0MemObjAddress(Mem.MapObjR3);
+                *pHCPhys = RTR0MemObjGetPagePhysAddr(Mem.MemObj, 0);
                 return 0;
             }
+
             rc2 = RTR0MemObjFree(Mem.MapObjR3, false);
             AssertRC(rc2);
@@ -1931 +1933 @@
                 return 0;
             }
+
             rc2 = RTR0MemObjFree(Mem.MapObjR3, false);
             AssertRC(rc2);

trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp

@@ -28 +28 @@
 #include <sys/param.h>
 #undef PVM
+#include <IOKit/IOLib.h> /* Assert as function */
 
 #include "SUPDRV.h"
+#include <VBox/version.h>
 #include <iprt/types.h>
 #include <iprt/initterm.h>
@@ -35 +37 @@
 #include <iprt/spinlock.h>
 #include <iprt/semaphore.h>
+#include <iprt/alloc.h>
 
 #include <mach/kmod.h>
@@ -43 +46 @@
 #include <sys/malloc.h>
 #include <sys/proc.h>
+#include <IOKit/IOService.h>
+#include <IOKit/IOUserclient.h>
 
 
@@ -57 +62 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
+__BEGIN_DECLS
 static kern_return_t    VBoxSupDrvStart(struct kmod_info *pKModInfo, void *pvData);
 static kern_return_t    VBoxSupDrvStop(struct kmod_info *pKModInfo, void *pvData);
@@ -66 +72 @@
 
 static int              VBoxSupDrvErr2DarwinErr(int rc);
+__END_DECLS
+
+
+/*******************************************************************************
+*   Structures and Typedefs                                                    *
+*******************************************************************************/
+/**
+ * The service class.
+ * This is just a formality really.
+ */
+class org_virtualbox_SupDrv : public IOService
+{
+    OSDeclareDefaultStructors(org_virtualbox_SupDrv)
+
+public:
+    virtual bool init(OSDictionary *pDictionary = 0);
+    virtual void free(void);
+    virtual bool start(IOService *pProvider);
+    virtual void stop(IOService *pProvider);
+    virtual IOService *probe(IOService *pProvider, SInt32 *pi32Score);
+};
+
+OSDefineMetaClassAndStructors(org_virtualbox_SupDrv, IOService)
+
+
+/**
+ * An attempt at getting that clientDied() notification.
+ * I don't think it'll work as I cannot figure out where/what creates the correct
+ * port right.
+ */
+class org_virtualbox_SupDrvClient : public IOUserClient
+{
+    OSDeclareDefaultStructors(org_virtualbox_SupDrvClient)
+
+private:
+    PSUPDRVSESSION          m_pSession;     /**< The session. */
+    task_t                  m_Task;         /**< The client task. */
+    org_virtualbox_SupDrv  *m_pProvider;    /**< The service provider. */
+
+public:
+    virtual bool initWithTask(task_t OwningTask, void *pvSecurityId, UInt32 u32Type);
+    virtual bool start(IOService *pProvider);
+    virtual void stop(IOService *pProvider);
+    virtual IOReturn clientClose(void);
+    virtual IOReturn clientDied(void);
+    virtual bool terminate(IOOptionBits fOptions = 0);
+    virtual bool finalize(IOOptionBits fOptions);
+};
+
+OSDefineMetaClassAndStructors(org_virtualbox_SupDrvClient, IOUserClient)
+
 
 
@@ -74 +131 @@
  * Declare the module stuff.
  */
-KMOD_EXPLICIT_DECL(vboxdrv, "1.0", VBoxSupDrvStart, VBoxSupDrvStop)
+__BEGIN_DECLS
+extern kern_return_t _start(struct kmod_info *pKModInfo, void *pvData);
+extern kern_return_t _stop(struct kmod_info *pKModInfo, void *pvData);
+__private_extern__ kmod_start_func_t *_realmain;
+__private_extern__ kmod_stop_func_t  *_antimain;
+__private_extern__ int                _kext_apple_cc;
+
+KMOD_EXPLICIT_DECL(VBoxDrv, VBOX_VERSION_STRING, _start, _stop)
+kmod_start_func_t *_realmain = VBoxSupDrvStart;
+kmod_stop_func_t  *_antimain = VBoxSupDrvStop;
+int                _kext_apple_cc = __APPLE_CC__;
+__END_DECLS
+
 
 /**
@@ -86 +155 @@
 static struct cdevsw    g_DevCW =
 {
-    .d_open = VBoxSupDrvOpen,
-    .d_close = VBoxSupDrvClose,
-    .d_read = eno_rdwrt,
-    .d_write = eno_rdwrt,
-    .d_ioctl = VBoxSupDrvIOCtl,
-    .d_stop = eno_stop,
-    .d_reset = eno_reset,
-    .d_ttys = NULL,
-    .d_select = eno_select,
-    .d_mmap = eno_mmap,
-    .d_strategy = eno_strat,
-    .d_getc = eno_getc,
-    .d_putc = eno_putc,
-    .d_type = 0
+    /** @todo g++ doesn't like this syntax - it worked with gcc before renaming to .cpp. */
+    /*.d_open  = */VBoxSupDrvOpen,
+    /*.d_close = */VBoxSupDrvClose,
+    /*.d_read  = */eno_rdwrt,
+    /*.d_write = */eno_rdwrt,
+    /*.d_ioctl = */VBoxSupDrvIOCtl,
+    /*.d_stop  = */eno_stop,
+    /*.d_reset = */eno_reset,
+    /*.d_ttys  = */NULL,
+    /*.d_select= */eno_select,
+    /*.d_mmap  = */eno_mmap,
+    /*.d_strategy = */eno_strat,
+    /*.d_getc  = */eno_getc,
+    /*.d_putc  = */eno_putc,
+    /*.d_type  = */0
 };
 
 /** Major device number. */
-static int                  g_iMajorDeviceNo = -1;
+static int              g_iMajorDeviceNo = -1;
 /** Registered devfs device handle. */
 static void            *g_hDevFsDevice = NULL;
@@ -380 +450 @@
     void               *pvPageBuf = NULL;
     void               *pvBuf = NULL;
-    int                 cbBuf = 0;
+    unsigned long       cbBuf = 0;
     unsigned            cbOut = 0;
     PSUPDRVIOCTLDATA    pArgs = (PSUPDRVIOCTLDATA)pData;
@@ -400 +470 @@
     {
         cbBuf = max(pArgs->cbIn, pArgs->cbOut);
-        MALLOC(pvBuf, void *, cbBuf, M_TEMP, M_WAITOK);
+        pvBuf = RTMemTmpAlloc(cbBuf);
         if (pvBuf == NULL)
             pvPageBuf = pvBuf = IOMallocAligned(cbBuf, 8);
@@ -415 +485 @@
                 IOFreeAligned(pvPageBuf, cbBuf);
             else
-                FREE(pvBuf, M_TEMP);
+                RTMemTmpFree(pvBuf);
             return rc;
         }
@@ -456 +526 @@
         IOFreeAligned(pvPageBuf, cbBuf);
     else if (pvBuf)
-        FREE(pvBuf, M_TEMP);
+        RTMemTmpFree(pvBuf);
 
     dprintf2(("VBoxSupDrvIOCtl: returns %d\n", rc));
@@ -524 +594 @@
 RTDECL(int) SUPR0Printf(const char *pszFormat, ...)
 {
-    va_list      args;
-    char         szMsg[512];
+    va_list     args;
+    char        szMsg[512];
 
     va_start(args, pszFormat);
@@ -551 +621 @@
 RTDECL(void) AssertMsg2(const char *pszFormat, ...)
 {   /* forwarder. */
-    va_list      ap;
-    char         msg[256];
+    va_list     ap;
+    char        msg[256];
 
     va_start(ap, pszFormat);
@@ -561 +631 @@
 }
 
+
+/*
+ *
+ * org_virtualbox_SupDrv
+ *
+ */
+
+
+/**
+ * Initialize the object.
+ */
+bool org_virtualbox_SupDrv::init(OSDictionary *pDictionary)
+{
+    dprintf(("org_virtualbox_SupDrv::init([%p], %p)\n", this, pDictionary));
+    if (IOService::init(pDictionary))
+    {
+        /* init members. */
+        return true;
+    }
+    return false;
+}
+
+
+/**
+ * Free the object.
+ */
+void org_virtualbox_SupDrv::free(void)
+{
+    dprintf(("IOService::free([%p])\n", this));
+    IOService::free();
+}
+
+
+/**
+ * Check if it's ok to start this service.
+ * It's always ok by us, so it's up to IOService to decide really.
+ */
+IOService *org_virtualbox_SupDrv::probe(IOService *pProvider, SInt32 *pi32Score)
+{
+    dprintf(("org_virtualbox_SupDrv::probe([%p])\n", this));
+    return IOService::probe(pProvider, pi32Score);
+}
+
+
+/**
+ * Start this service.
+ */
+bool org_virtualbox_SupDrv::start(IOService *pProvider)
+{
+    dprintf(("org_virtualbox_SupDrv::start([%p])\n", this));
+
+    if (IOService::start(pProvider))
+    {
+        /* register the service. */
+        registerService();
+        return true;
+    }
+    return false;
+}
+
+
+/**
+ * Stop this service.
+ */
+void org_virtualbox_SupDrv::stop(IOService *pProvider)
+{
+    dprintf(("org_virtualbox_SupDrv::stop([%p], %p)\n", this, pProvider));
+    IOService::stop(pProvider);
+}
+
+
+/*
+ *
+ * org_virtualbox_SupDrvClient
+ *
+ */
+
+
+/**
+ * Initializer called when the client opens the service.
+ */
+bool org_virtualbox_SupDrvClient::initWithTask(task_t OwningTask, void *pvSecurityId, UInt32 u32Type)
+{
+    dprintf(("org_virtualbox_SupDrvClient::initWithTask([%p], %#x, %p, %#x)\n", this, OwningTask, pvSecurityId, u32Type));
+
+    if (!OwningTask)
+        return false;
+    if (IOUserClient::initWithTask(OwningTask, pvSecurityId , u32Type))
+    {
+        m_Task = OwningTask;
+        m_pSession = NULL;
+        m_pProvider = NULL;
+        return true;
+    }
+    return false;
+}
+
+
+/**
+ * Start the client service.
+ */
+bool org_virtualbox_SupDrvClient::start(IOService *pProvider)
+{
+    dprintf(("org_virtualbox_SupDrvClient::start([%p], %p)\n", this, pProvider));
+    if (IOUserClient::start(pProvider))
+    {
+        m_pProvider = OSDynamicCast(org_virtualbox_SupDrv, pProvider);
+        if (m_pProvider)
+        {
+            /* this is where we could create the section. */
+            return true;
+        }
+        dprintf(("org_virtualbox_SupDrvClient::start: %p isn't org_virtualbox_SupDrv\n", pProvider));
+    }
+    return false;
+}
+
+
+/**
+ * Client exits normally.
+ */
+IOReturn org_virtualbox_SupDrvClient::clientClose(void)
+{
+    dprintf(("org_virtualbox_SupDrvClient::clientClose([%p])\n", this));
+
+    m_pProvider = NULL;
+    terminate();
+
+    return kIOReturnSuccess;
+}
+
+
+/**
+ * The client exits abnormally / forgets to do cleanups.
+ */
+IOReturn org_virtualbox_SupDrvClient::clientDied(void)
+{
+    dprintf(("org_virtualbox_SupDrvClient::clientDied([%p])\n", this));
+
+    /* IOUserClient::clientDied() only calls calls close... */
+    return IOUserClient::clientDied();
+}
+
+
+/**
+ * Stop the client service.
+ */
+void org_virtualbox_SupDrvClient::stop(IOService *pProvider)
+{
+    dprintf(("org_virtualbox_SupDrvClient::stop([%p])\n", this));
+    IOUserClient::stop(pProvider);
+}
+
+
+/**
+ * Terminate the service (initiate the destruction).
+ */
+bool org_virtualbox_SupDrvClient::terminate(IOOptionBits fOptions)
+{
+    dprintf(("org_virtualbox_SupDrvClient::terminate([%p], %#x)\n", this, fOptions));
+    return IOUserClient::terminate(fOptions);
+}
+
+
+/**
+ * The final stage of the client service destruction.
+ */
+bool org_virtualbox_SupDrvClient::finalize(IOOptionBits fOptions)
+{
+    dprintf(("org_virtualbox_SupDrvClient::finalize([%p], %#x)\n", this, fOptions));
+    return IOUserClient::finalize(fOptions);
+}
+