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

Timestamp:

Jul 23, 2008 6:37:18 PM (17 years ago)

Author:

vboxsync

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

33621

Message:

supdrv: Fixed missing session clean on the mac when more than one client was active.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrvInternal.h (modified) (1 diff)
• darwin/SUPDrv-darwin.cpp (modified) (11 diffs)
• darwin/SUPLib-darwin.cpp (modified) (5 diffs)

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

@@ -565 +565 @@
      * This is NIL_RTR0PROCESS for kernel sessions and valid for user ones. */
     RTR0PROCESS                 R0Process;
+#if defined(RT_OS_DARWIN)
+    /** Pointer to the associated org_virtualbox_SupDrvClient object. */
+    void                       *pvSupDrvClient;
+    /** Whether this session has been opened or not. */
+    bool                        fOpened;
+#endif
 #if defined(RT_OS_OS2)
     /** The system file number of this session. */

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

@@ -134 +134 @@
     virtual bool initWithTask(task_t OwningTask, void *pvSecurityId, UInt32 u32Type);
     virtual bool start(IOService *pProvider);
+    static  void sessionClose(RTPROCESS Process);
     virtual IOReturn clientClose(void);
     virtual IOReturn clientDied(void);
@@ -341 +342 @@
 
     /*
-     * Create a new session.
-     */
-    rc = supdrvCreateSession(&g_DevExt, true /* fUser */, &pSession);
-    if (RT_SUCCESS(rc))
-    {
+     * Find the session created by org_virtualbox_SupDrvClient, fail
+     * if no such session, and mark it as opened. We set the uid & gid
+     * here too, since that is more straight forward at this point.
+     */
+    struct ucred *pCred = proc_ucred(pProcess);
+    if (pCred)
+    {
+        RTUID           Uid = pCred->cr_uid;
+        RTGID           Gid = pCred->cr_gid;
+        RTPROCESS       Process = RTProcSelf();
+        unsigned        iHash = SESSION_HASH(Process);
         RTSPINLOCKTMP   Tmp = RTSPINLOCKTMP_INITIALIZER;
-        unsigned        iHash;
-        struct ucred   *pCred = proc_ucred(pProcess);
-        if (pCred)
-        {
-            pSession->Uid = pCred->cr_uid;
-            pSession->Gid = pCred->cr_gid;
-        }
-
-        /*
-         * Insert it into the hash table.
-         */
-        iHash = SESSION_HASH(pSession->Process);
         RTSpinlockAcquireNoInts(g_Spinlock, &Tmp);
-        pSession->pNextHash = g_apSessionHashTab[iHash];
-        g_apSessionHashTab[iHash] = pSession;
-        ASMAtomicIncS32(&g_cSessions);
+
+        pSession = g_apSessionHashTab[iHash];
+        if (pSession && pSession->Process != Process)
+        {
+            do pSession = pSession->pNextHash;
+            while (pSession && pSession->Process != Process);
+        }
+        if (pSession)
+        {
+            if (!pSession->fOpened)
+            {
+                pSession->fOpened = true;
+                pSession->Uid = Uid;
+                pSession->Gid = Gid;
+            }
+            else
+                rc = VERR_ALREADY_LOADED;
+        }
+        else
+            rc = VERR_GENERAL_FAILURE;
+
         RTSpinlockReleaseNoInts(g_Spinlock, &Tmp);
     }
+    else
+        rc = SUPDRV_ERR_INVALID_PARAM;
 
 #ifdef DEBUG_DARWIN_GIP
@@ -380 +395 @@
 static int VBoxDrvDarwinClose(dev_t Dev, int fFlags, int fDevType, struct proc *pProcess)
 {
-    RTSPINLOCKTMP   Tmp = RTSPINLOCKTMP_INITIALIZER;
-    const RTPROCESS Process = proc_pid(pProcess);
-    const unsigned  iHash = SESSION_HASH(Process);
-    PSUPDRVSESSION  pSession;
-
-    Log(("VBoxDrvDarwinClose: pid=%d\n", (int)Process));
-
-    /*
-     * Remove from the hash table.
+    Log(("VBoxDrvDarwinClose: pid=%d\n", (int)RTProcSelf()));
+    Assert(proc_pid(pProcess) == (int)RTProcSelf());
+
+    /*
+     * Hand the session closing to org_virtualbox_SupDrvClient.
+     */
+    org_virtualbox_SupDrvClient::sessionClose(RTProcSelf());
+    return 0;
+}
+
+
+/**
+ * Device I/O Control entry point.
+ *
+ * @returns Darwin for slow IOCtls and VBox status code for the fast ones.
+ * @param   Dev         The device number (major+minor).
+ * @param   iCmd        The IOCtl command.
+ * @param   pData       Pointer to the data (if any it's a SUPDRVIOCTLDATA (kernel copy)).
+ * @param   fFlags      Flag saying we're a character device (like we didn't know already).
+ * @param   pProcess    The process issuing this request.
+ */
+static int VBoxDrvDarwinIOCtl(dev_t Dev, u_long iCmd, caddr_t pData, int fFlags, struct proc *pProcess)
+{
+    RTSPINLOCKTMP       Tmp = RTSPINLOCKTMP_INITIALIZER;
+    const RTPROCESS     Process = proc_pid(pProcess);
+    const unsigned      iHash = SESSION_HASH(Process);
+    PSUPDRVSESSION      pSession;
+
+    /*
+     * Find the session.
      */
     RTSpinlockAcquireNoInts(g_Spinlock, &Tmp);
     pSession = g_apSessionHashTab[iHash];
+    if (pSession && pSession->Process != Process)
+    {
+        do pSession = pSession->pNextHash;
+        while (pSession && pSession->Process != Process);
+    }
+    RTSpinlockReleaseNoInts(g_Spinlock, &Tmp);
+    if (!pSession)
+    {
+        OSDBGPRINT(("VBoxDrvDarwinIOCtl: WHAT?!? pSession == NULL! This must be a mistake... pid=%d iCmd=%#x\n",
+                    (int)Process, iCmd));
+        return EINVAL;
+    }
+
+    /*
+     * Deal with the two high-speed IOCtl that takes it's arguments from
+     * the session and iCmd, and only returns a VBox status code.
+     */
+    if (    iCmd == SUP_IOCTL_FAST_DO_RAW_RUN
+        ||  iCmd == SUP_IOCTL_FAST_DO_HWACC_RUN
+        ||  iCmd == SUP_IOCTL_FAST_DO_NOP)
+        return supdrvIOCtlFast(iCmd, &g_DevExt, pSession);
+    return VBoxDrvDarwinIOCtlSlow(pSession, iCmd, pData, pProcess);
+}
+
+
+/**
+ * Worker for VBoxDrvDarwinIOCtl that takes the slow IOCtl functions.
+ *
+ * @returns Darwin errno.
+ *
+ * @param pSession  The session.
+ * @param iCmd      The IOCtl command.
+ * @param pData     Pointer to the kernel copy of the SUPDRVIOCTLDATA buffer.
+ * @param pProcess  The calling process.
+ */
+static int VBoxDrvDarwinIOCtlSlow(PSUPDRVSESSION pSession, u_long iCmd, caddr_t pData, struct proc *pProcess)
+{
+    LogFlow(("VBoxDrvDarwinIOCtlSlow: pSession=%p iCmd=%p pData=%p pProcess=%p\n", pSession, iCmd, pData, pProcess));
+
+
+    /*
+     * Buffered or unbuffered?
+     */
+    PSUPREQHDR pHdr;
+    user_addr_t pUser = 0;
+    void *pvPageBuf = NULL;
+    uint32_t cbReq = IOCPARM_LEN(iCmd);
+    if ((IOC_DIRMASK & iCmd) == IOC_INOUT)
+    {
+        pHdr = (PSUPREQHDR)pData;
+        if (RT_UNLIKELY(cbReq < sizeof(*pHdr)))
+        {
+            OSDBGPRINT(("VBoxDrvDarwinIOCtlSlow: cbReq=%#x < %#x; iCmd=%#lx\n", cbReq, (int)sizeof(*pHdr), iCmd));
+            return EINVAL;
+        }
+        if (RT_UNLIKELY((pHdr->fFlags & SUPREQHDR_FLAGS_MAGIC_MASK) != SUPREQHDR_FLAGS_MAGIC))
+        {
+            OSDBGPRINT(("VBoxDrvDarwinIOCtlSlow: bad magic fFlags=%#x; iCmd=%#lx\n", pHdr->fFlags, iCmd));
+            return EINVAL;
+        }
+        if (RT_UNLIKELY(    RT_MAX(pHdr->cbIn, pHdr->cbOut) != cbReq
+                        ||  pHdr->cbIn < sizeof(*pHdr)
+                        ||  pHdr->cbOut < sizeof(*pHdr)))
+        {
+            OSDBGPRINT(("VBoxDrvDarwinIOCtlSlow: max(%#x,%#x) != %#x; iCmd=%#lx\n", pHdr->cbIn, pHdr->cbOut, cbReq, iCmd));
+            return EINVAL;
+        }
+    }
+    else if ((IOC_DIRMASK & iCmd) == IOC_VOID && !cbReq)
+    {
+        /*
+         * Get the header and figure out how much we're gonna have to read.
+         */
+        SUPREQHDR Hdr;
+        pUser = (user_addr_t)*(void **)pData;
+        int rc = copyin(pUser, &Hdr, sizeof(Hdr));
+        if (RT_UNLIKELY(rc))
+        {
+            OSDBGPRINT(("VBoxDrvDarwinIOCtlSlow: copyin(%llx,Hdr,) -> %#x; iCmd=%#lx\n", (unsigned long long)pUser, rc, iCmd));
+            return rc;
+        }
+        if (RT_UNLIKELY((Hdr.fFlags & SUPREQHDR_FLAGS_MAGIC_MASK) != SUPREQHDR_FLAGS_MAGIC))
+        {
+            OSDBGPRINT(("VBoxDrvDarwinIOCtlSlow: bad magic fFlags=%#x; iCmd=%#lx\n", Hdr.fFlags, iCmd));
+            return EINVAL;
+        }
+        cbReq = RT_MAX(Hdr.cbIn, Hdr.cbOut);
+        if (RT_UNLIKELY(    Hdr.cbIn < sizeof(Hdr)
+                        ||  Hdr.cbOut < sizeof(Hdr)
+                        ||  cbReq > _1M*16))
+        {
+            OSDBGPRINT(("VBoxDrvDarwinIOCtlSlow: max(%#x,%#x); iCmd=%#lx\n", Hdr.cbIn, Hdr.cbOut, iCmd));
+            return EINVAL;
+        }
+
+        /*
+         * Allocate buffer and copy in the data.
+         */
+        pHdr = (PSUPREQHDR)RTMemTmpAlloc(cbReq);
+        if (!pHdr)
+            pvPageBuf = pHdr = (PSUPREQHDR)IOMallocAligned(RT_ALIGN_Z(cbReq, PAGE_SIZE), 8);
+        if (RT_UNLIKELY(!pHdr))
+        {
+            OSDBGPRINT(("VBoxDrvDarwinIOCtlSlow: failed to allocate buffer of %d bytes; iCmd=%#lx\n", cbReq, iCmd));
+            return ENOMEM;
+        }
+        rc = copyin(pUser, pHdr, Hdr.cbIn);
+        if (RT_UNLIKELY(rc))
+        {
+            OSDBGPRINT(("VBoxDrvDarwinIOCtlSlow: copyin(%llx,%p,%#x) -> %#x; iCmd=%#lx\n",
+                        (unsigned long long)pUser, pHdr, Hdr.cbIn, rc, iCmd));
+            if (pvPageBuf)
+                IOFreeAligned(pvPageBuf, RT_ALIGN_Z(cbReq, PAGE_SIZE));
+            else
+                RTMemTmpFree(pHdr);
+            return rc;
+        }
+    }
+    else
+    {
+        Log(("VBoxDrvDarwinIOCtlSlow: huh? cbReq=%#x iCmd=%#lx\n", cbReq, iCmd));
+        return EINVAL;
+    }
+
+    /*
+     * Process the IOCtl.
+     */
+    int rc = supdrvIOCtl(iCmd, &g_DevExt, pSession, pHdr);
+    if (RT_LIKELY(!rc))
+    {
+        /*
+         * If not buffered, copy back the buffer before returning.
+         */
+        if (pUser)
+        {
+            uint32_t cbOut = pHdr->cbOut;
+            if (cbOut > cbReq)
+            {
+                OSDBGPRINT(("VBoxDrvDarwinIOCtlSlow: too much output! %#x > %#x; uCmd=%#lx!\n", cbOut, cbReq, iCmd));
+                cbOut = cbReq;
+            }
+            rc = copyout(pHdr, pUser, cbOut);
+            if (RT_UNLIKELY(rc))
+                OSDBGPRINT(("VBoxDrvDarwinIOCtlSlow: copyout(%p,%llx,%#x) -> %d; uCmd=%#lx!\n",
+                            pHdr, (unsigned long long)pUser, cbOut, rc, iCmd));
+
+            /* cleanup */
+            if (pvPageBuf)
+                IOFreeAligned(pvPageBuf, RT_ALIGN_Z(cbReq, PAGE_SIZE));
+            else
+                RTMemTmpFree(pHdr);
+        }
+    }
+    else
+    {
+        /*
+         * The request failed, just clean up.
+         */
+        if (pUser)
+        {
+            if (pvPageBuf)
+                IOFreeAligned(pvPageBuf, RT_ALIGN_Z(cbReq, PAGE_SIZE));
+            else
+                RTMemTmpFree(pHdr);
+        }
+
+        Log(("VBoxDrvDarwinIOCtlSlow: pid=%d iCmd=%lx pData=%p failed, rc=%d\n", proc_pid(pProcess), iCmd, (void *)pData, rc));
+        rc = EINVAL;
+    }
+
+    Log2(("VBoxDrvDarwinIOCtlSlow: returns %d\n", rc));
+    return rc;
+}
+
+
+/**
+ * The SUPDRV IDC entry point.
+ *
+ * @returns VBox status code, see supdrvIDC.
+ * @param   iReq        The request code.
+ * @param   pReq        The request.
+ */
+int VBOXCALL SUPDrvDarwinIDC(uint32_t uReq, PSUPDRVIDCREQHDR pReq)
+{
+    PSUPDRVSESSION  pSession;
+
+    /*
+     * Some quick validations.
+     */
+    if (RT_UNLIKELY(!VALID_PTR(pReq)))
+        return VERR_INVALID_POINTER;
+
+    pSession = pReq->pSession;
+    if (pSession)
+    {
+        if (RT_UNLIKELY(!VALID_PTR(pSession)))
+            return VERR_INVALID_PARAMETER;
+        if (RT_UNLIKELY(pSession->pDevExt != &g_DevExt))
+            return VERR_INVALID_PARAMETER;
+    }
+    else if (RT_UNLIKELY(uReq != SUPDRV_IDC_REQ_CONNECT))
+        return VERR_INVALID_PARAMETER;
+
+    /*
+     * Do the job.
+     */
+    return supdrvIDC(uReq, &g_DevExt, pSession, pReq);
+}
+
+
+/**
+ * Initializes any OS specific object creator fields.
+ */
+void VBOXCALL   supdrvOSObjInitCreator(PSUPDRVOBJ pObj, PSUPDRVSESSION pSession)
+{
+    NOREF(pObj);
+    NOREF(pSession);
+}
+
+
+/**
+ * Checks if the session can access the object.
+ *
+ * @returns true if a decision has been made.
+ * @returns false if the default access policy should be applied.
+ *
+ * @param   pObj        The object in question.
+ * @param   pSession    The session wanting to access the object.
+ * @param   pszObjName  The object name, can be NULL.
+ * @param   prc         Where to store the result when returning true.
+ */
+bool VBOXCALL   supdrvOSObjCanAccess(PSUPDRVOBJ pObj, PSUPDRVSESSION pSession, const char *pszObjName, int *prc)
+{
+    NOREF(pObj);
+    NOREF(pSession);
+    NOREF(pszObjName);
+    NOREF(prc);
+    return false;
+}
+
+
+bool VBOXCALL   supdrvOSGetForcedAsyncTscMode(PSUPDRVDEVEXT pDevExt)
+{
+    NOREF(pDevExt);
+    return false;
+}
+
+
+/**
+ * Converts a supdrv error code to a darwin error code.
+ *
+ * @returns corresponding darwin error code.
+ * @param   rc  supdrv error code (SUPDRV_ERR_* defines).
+ */
+static int VBoxDrvDarwinErr2DarwinErr(int rc)
+{
+    switch (rc)
+    {
+        case 0:                             return 0;
+        case SUPDRV_ERR_GENERAL_FAILURE:    return EACCES;
+        case SUPDRV_ERR_INVALID_PARAM:      return EINVAL;
+        case SUPDRV_ERR_INVALID_MAGIC:      return EILSEQ;
+        case SUPDRV_ERR_INVALID_HANDLE:     return ENXIO;
+        case SUPDRV_ERR_INVALID_POINTER:    return EFAULT;
+        case SUPDRV_ERR_LOCK_FAILED:        return ENOLCK;
+        case SUPDRV_ERR_ALREADY_LOADED:     return EEXIST;
+        case SUPDRV_ERR_PERMISSION_DENIED:  return EPERM;
+        case SUPDRV_ERR_VERSION_MISMATCH:   return ENOSYS;
+    }
+
+    return EPERM;
+}
+
+
+/** @todo move this to assembly where a simple "jmp printf" will to the trick. */
+RTDECL(int) SUPR0Printf(const char *pszFormat, ...)
+{
+    va_list     args;
+    char        szMsg[512];
+
+    va_start(args, pszFormat);
+    vsnprintf(szMsg, sizeof(szMsg) - 1, pszFormat, args);
+    va_end(args);
+
+    szMsg[sizeof(szMsg) - 1] = '\0';
+    printf("%s", szMsg);
+    return 0;
+}
+
+
+/*
+ *
+ * org_virtualbox_SupDrv
+ *
+ */
+
+
+/**
+ * Initialize the object.
+ */
+bool org_virtualbox_SupDrv::init(OSDictionary *pDictionary)
+{
+    LogFlow(("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)
+{
+    LogFlow(("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)
+{
+    LogFlow(("org_virtualbox_SupDrv::probe([%p])\n", this));
+    return IOService::probe(pProvider, pi32Score);
+}
+
+
+/**
+ * Start this service.
+ */
+bool org_virtualbox_SupDrv::start(IOService *pProvider)
+{
+    LogFlow(("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)
+{
+    LogFlow(("org_virtualbox_SupDrv::stop([%p], %p)\n", this, pProvider));
+    IOService::stop(pProvider);
+}
+
+
+/**
+ * Termination request.
+ *
+ * @return  true if we're ok with shutting down now, false if we're not.
+ * @param   fOptions        Flags.
+ */
+bool org_virtualbox_SupDrv::terminate(IOOptionBits fOptions)
+{
+    bool fRc;
+    LogFlow(("org_virtualbox_SupDrv::terminate: reference_count=%d g_cSessions=%d (fOptions=%#x)\n",
+             KMOD_INFO_NAME.reference_count, ASMAtomicUoReadS32(&g_cSessions), fOptions));
+    if (    KMOD_INFO_NAME.reference_count != 0
+        ||  ASMAtomicUoReadS32(&g_cSessions))
+        fRc = false;
+    else
+        fRc = IOService::terminate(fOptions);
+    LogFlow(("org_virtualbox_SupDrv::terminate: returns %d\n", fRc));
+    return fRc;
+}
+
+
+/*
+ *
+ * org_virtualbox_SupDrvClient
+ *
+ */
+
+
+/**
+ * Initializer called when the client opens the service.
+ */
+bool org_virtualbox_SupDrvClient::initWithTask(task_t OwningTask, void *pvSecurityId, UInt32 u32Type)
+{
+    LogFlow(("org_virtualbox_SupDrvClient::initWithTask([%p], %#x, %p, %#x) (cur pid=%d proc=%p)\n",
+             this, OwningTask, pvSecurityId, u32Type, RTProcSelf(), RTR0ProcHandleSelf()));
+    AssertMsg((RTR0PROCESS)OwningTask == RTR0ProcHandleSelf(), ("%p %p\n", OwningTask, RTR0ProcHandleSelf()));
+
+    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)
+{
+    LogFlow(("org_virtualbox_SupDrvClient::start([%p], %p) (cur pid=%d proc=%p)\n",
+             this, pProvider, RTProcSelf(), RTR0ProcHandleSelf() ));
+    AssertMsgReturn((RTR0PROCESS)m_Task == RTR0ProcHandleSelf(),
+                    ("%p %p\n", m_Task, RTR0ProcHandleSelf()),
+                    false);
+
+    if (IOUserClient::start(pProvider))
+    {
+        m_pProvider = OSDynamicCast(org_virtualbox_SupDrv, pProvider);
+        if (m_pProvider)
+        {
+            Assert(!m_pSession);
+
+            /*
+             * Create a new session.
+             */
+            int rc = supdrvCreateSession(&g_DevExt, true /* fUser */, &m_pSession);
+            if (RT_SUCCESS(rc))
+            {
+                m_pSession->fOpened = false;
+                /* The Uid and Gid fields are set on open. */
+
+                /*
+                 * Insert it into the hash table, checking that there isn't
+                 * already one for this process first.
+                 */
+                unsigned iHash = SESSION_HASH(m_pSession->Process);
+                RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
+                RTSpinlockAcquireNoInts(g_Spinlock, &Tmp);
+
+                PSUPDRVSESSION pCur = g_apSessionHashTab[iHash];
+                if (pCur && pCur->Process != m_pSession->Process)
+                {
+                    do pCur = pCur->pNextHash;
+                    while (pCur && pCur->Process != m_pSession->Process);
+                }
+                if (!pCur)
+                {
+                    m_pSession->pNextHash = g_apSessionHashTab[iHash];
+                    g_apSessionHashTab[iHash] = m_pSession;
+                    m_pSession->pvSupDrvClient = this;
+                    ASMAtomicIncS32(&g_cSessions);
+                    rc = VINF_SUCCESS;
+                }
+                else
+                    rc = VERR_ALREADY_LOADED;
+
+                RTSpinlockReleaseNoInts(g_Spinlock, &Tmp);
+                if (RT_SUCCESS(rc))
+                {
+                    Log(("org_virtualbox_SupDrvClient::start: created session %p for pid %d\n", m_pSession, (int)RTProcSelf()));
+                    return true;
+                }
+
+                LogFlow(("org_virtualbox_SupDrvClient::start: already got a session for this process (%p)\n", pCur));
+                supdrvCloseSession(&g_DevExt, m_pSession);
+            }
+
+            m_pSession = NULL;
+            LogFlow(("org_virtualbox_SupDrvClient::start: rc=%Rrc from supdrvCreateSession\n", rc));
+        }
+        else
+            LogFlow(("org_virtualbox_SupDrvClient::start: %p isn't org_virtualbox_SupDrv\n", pProvider));
+    }
+    return false;
+}
+
+
+/**
+ * Common worker for clientClose and VBoxDrvDarwinClose.
+ *
+ * It will
+ */
+/* static */ void org_virtualbox_SupDrvClient::sessionClose(RTPROCESS Process)
+{
+    /*
+     * Look for the session.
+     */
+    const unsigned  iHash = SESSION_HASH(Process);
+    RTSPINLOCKTMP   Tmp = RTSPINLOCKTMP_INITIALIZER;
+    RTSpinlockAcquireNoInts(g_Spinlock, &Tmp);
+    PSUPDRVSESSION  pSession = g_apSessionHashTab[iHash];
     if (pSession)
     {
@@ -423 +956 @@
     if (!pSession)
     {
-        OSDBGPRINT(("VBoxDrvDarwinClose: WHAT?!? pSession == NULL! This must be a mistake... pid=%d (close)\n",
-                    (int)Process));
-        return EINVAL;
+        Log(("SupDrvClient::sessionClose: pSession == NULL, pid=%d; freed already?\n", (int)Process));
+        return;
+    }
+
+    /*
+     * Remove it from the client object.
+     */
+    org_virtualbox_SupDrvClient *pThis = (org_virtualbox_SupDrvClient *)pSession->pvSupDrvClient;
+    pSession->pvSupDrvClient = NULL;
+    if (pThis)
+    {
+        Assert(pThis->m_pSession == pSession);
+        pThis->m_pSession = NULL;
     }
 
@@ -432 +975 @@
      */
     supdrvCloseSession(&g_DevExt, pSession);
-    return 0;
-}
-
-
-/**
- * Device I/O Control entry point.
- *
- * @returns Darwin for slow IOCtls and VBox status code for the fast ones.
- * @param   Dev         The device number (major+minor).
- * @param   iCmd        The IOCtl command.
- * @param   pData       Pointer to the data (if any it's a SUPDRVIOCTLDATA (kernel copy)).
- * @param   fFlags      Flag saying we're a character device (like we didn't know already).
- * @param   pProcess    The process issuing this request.
- */
-static int VBoxDrvDarwinIOCtl(dev_t Dev, u_long iCmd, caddr_t pData, int fFlags, struct proc *pProcess)
-{
-    RTSPINLOCKTMP       Tmp = RTSPINLOCKTMP_INITIALIZER;
-    const RTPROCESS     Process = proc_pid(pProcess);
-    const unsigned      iHash = SESSION_HASH(Process);
-    PSUPDRVSESSION      pSession;
-
-    /*
-     * Find the session.
-     */
-    RTSpinlockAcquireNoInts(g_Spinlock, &Tmp);
-    pSession = g_apSessionHashTab[iHash];
-    if (pSession && pSession->Process != Process)
-    {
-        do pSession = pSession->pNextHash;
-        while (pSession && pSession->Process != Process);
-    }
-    RTSpinlockReleaseNoInts(g_Spinlock, &Tmp);
-    if (!pSession)
-    {
-        OSDBGPRINT(("VBoxDrvDarwinIOCtl: WHAT?!? pSession == NULL! This must be a mistake... pid=%d iCmd=%#x\n",
-                    (int)Process, iCmd));
-        return EINVAL;
-    }
-
-    /*
-     * Deal with the two high-speed IOCtl that takes it's arguments from
-     * the session and iCmd, and only returns a VBox status code.
-     */
-    if (    iCmd == SUP_IOCTL_FAST_DO_RAW_RUN
-        ||  iCmd == SUP_IOCTL_FAST_DO_HWACC_RUN
-        ||  iCmd == SUP_IOCTL_FAST_DO_NOP)
-        return supdrvIOCtlFast(iCmd, &g_DevExt, pSession);
-    return VBoxDrvDarwinIOCtlSlow(pSession, iCmd, pData, pProcess);
-}
-
-
-/**
- * Worker for VBoxDrvDarwinIOCtl that takes the slow IOCtl functions.
- *
- * @returns Darwin errno.
- *
- * @param pSession  The session.
- * @param iCmd      The IOCtl command.
- * @param pData     Pointer to the kernel copy of the SUPDRVIOCTLDATA buffer.
- * @param pProcess  The calling process.
- */
-static int VBoxDrvDarwinIOCtlSlow(PSUPDRVSESSION pSession, u_long iCmd, caddr_t pData, struct proc *pProcess)
-{
-    LogFlow(("VBoxDrvDarwinIOCtlSlow: pSession=%p iCmd=%p pData=%p pProcess=%p\n", pSession, iCmd, pData, pProcess));
-
-
-    /*
-     * Buffered or unbuffered?
-     */
-    PSUPREQHDR pHdr;
-    user_addr_t pUser = 0;
-    void *pvPageBuf = NULL;
-    uint32_t cbReq = IOCPARM_LEN(iCmd);
-    if ((IOC_DIRMASK & iCmd) == IOC_INOUT)
-    {
-        pHdr = (PSUPREQHDR)pData;
-        if (RT_UNLIKELY(cbReq < sizeof(*pHdr)))
-        {
-            OSDBGPRINT(("VBoxDrvDarwinIOCtlSlow: cbReq=%#x < %#x; iCmd=%#lx\n", cbReq, (int)sizeof(*pHdr), iCmd));
-            return EINVAL;
-        }
-        if (RT_UNLIKELY((pHdr->fFlags & SUPREQHDR_FLAGS_MAGIC_MASK) != SUPREQHDR_FLAGS_MAGIC))
-        {
-            OSDBGPRINT(("VBoxDrvDarwinIOCtlSlow: bad magic fFlags=%#x; iCmd=%#lx\n", pHdr->fFlags, iCmd));
-            return EINVAL;
-        }
-        if (RT_UNLIKELY(    RT_MAX(pHdr->cbIn, pHdr->cbOut) != cbReq
-                        ||  pHdr->cbIn < sizeof(*pHdr)
-                        ||  pHdr->cbOut < sizeof(*pHdr)))
-        {
-            OSDBGPRINT(("VBoxDrvDarwinIOCtlSlow: max(%#x,%#x) != %#x; iCmd=%#lx\n", pHdr->cbIn, pHdr->cbOut, cbReq, iCmd));
-            return EINVAL;
-        }
-    }
-    else if ((IOC_DIRMASK & iCmd) == IOC_VOID && !cbReq)
-    {
-        /*
-         * Get the header and figure out how much we're gonna have to read.
-         */
-        SUPREQHDR Hdr;
-        pUser = (user_addr_t)*(void **)pData;
-        int rc = copyin(pUser, &Hdr, sizeof(Hdr));
-        if (RT_UNLIKELY(rc))
-        {
-            OSDBGPRINT(("VBoxDrvDarwinIOCtlSlow: copyin(%llx,Hdr,) -> %#x; iCmd=%#lx\n", (unsigned long long)pUser, rc, iCmd));
-            return rc;
-        }
-        if (RT_UNLIKELY((Hdr.fFlags & SUPREQHDR_FLAGS_MAGIC_MASK) != SUPREQHDR_FLAGS_MAGIC))
-        {
-            OSDBGPRINT(("VBoxDrvDarwinIOCtlSlow: bad magic fFlags=%#x; iCmd=%#lx\n", Hdr.fFlags, iCmd));
-            return EINVAL;
-        }
-        cbReq = RT_MAX(Hdr.cbIn, Hdr.cbOut);
-        if (RT_UNLIKELY(    Hdr.cbIn < sizeof(Hdr)
-                        ||  Hdr.cbOut < sizeof(Hdr)
-                        ||  cbReq > _1M*16))
-        {
-            OSDBGPRINT(("VBoxDrvDarwinIOCtlSlow: max(%#x,%#x); iCmd=%#lx\n", Hdr.cbIn, Hdr.cbOut, iCmd));
-            return EINVAL;
-        }
-
-        /*
-         * Allocate buffer and copy in the data.
-         */
-        pHdr = (PSUPREQHDR)RTMemTmpAlloc(cbReq);
-        if (!pHdr)
-            pvPageBuf = pHdr = (PSUPREQHDR)IOMallocAligned(RT_ALIGN_Z(cbReq, PAGE_SIZE), 8);
-        if (RT_UNLIKELY(!pHdr))
-        {
-            OSDBGPRINT(("VBoxDrvDarwinIOCtlSlow: failed to allocate buffer of %d bytes; iCmd=%#lx\n", cbReq, iCmd));
-            return ENOMEM;
-        }
-        rc = copyin(pUser, pHdr, Hdr.cbIn);
-        if (RT_UNLIKELY(rc))
-        {
-            OSDBGPRINT(("VBoxDrvDarwinIOCtlSlow: copyin(%llx,%p,%#x) -> %#x; iCmd=%#lx\n",
-                        (unsigned long long)pUser, pHdr, Hdr.cbIn, rc, iCmd));
-            if (pvPageBuf)
-                IOFreeAligned(pvPageBuf, RT_ALIGN_Z(cbReq, PAGE_SIZE));
-            else
-                RTMemTmpFree(pHdr);
-            return rc;
-        }
-    }
-    else
-    {
-        Log(("VBoxDrvDarwinIOCtlSlow: huh? cbReq=%#x iCmd=%#lx\n", cbReq, iCmd));
-        return EINVAL;
-    }
-
-    /*
-     * Process the IOCtl.
-     */
-    int rc = supdrvIOCtl(iCmd, &g_DevExt, pSession, pHdr);
-    if (RT_LIKELY(!rc))
-    {
-        /*
-         * If not buffered, copy back the buffer before returning.
-         */
-        if (pUser)
-        {
-            uint32_t cbOut = pHdr->cbOut;
-            if (cbOut > cbReq)
-            {
-                OSDBGPRINT(("VBoxDrvDarwinIOCtlSlow: too much output! %#x > %#x; uCmd=%#lx!\n", cbOut, cbReq, iCmd));
-                cbOut = cbReq;
-            }
-            rc = copyout(pHdr, pUser, cbOut);
-            if (RT_UNLIKELY(rc))
-                OSDBGPRINT(("VBoxDrvDarwinIOCtlSlow: copyout(%p,%llx,%#x) -> %d; uCmd=%#lx!\n",
-                            pHdr, (unsigned long long)pUser, cbOut, rc, iCmd));
-
-            /* cleanup */
-            if (pvPageBuf)
-                IOFreeAligned(pvPageBuf, RT_ALIGN_Z(cbReq, PAGE_SIZE));
-            else
-                RTMemTmpFree(pHdr);
-        }
-    }
-    else
-    {
-        /*
-         * The request failed, just clean up.
-         */
-        if (pUser)
-        {
-            if (pvPageBuf)
-                IOFreeAligned(pvPageBuf, RT_ALIGN_Z(cbReq, PAGE_SIZE));
-            else
-                RTMemTmpFree(pHdr);
-        }
-
-        Log(("VBoxDrvDarwinIOCtlSlow: pid=%d iCmd=%lx pData=%p failed, rc=%d\n", proc_pid(pProcess), iCmd, (void *)pData, rc));
-        rc = EINVAL;
-    }
-
-    Log2(("VBoxDrvDarwinIOCtlSlow: returns %d\n", rc));
-    return rc;
-}
-
-
-/**
- * The SUPDRV IDC entry point.
- *
- * @returns VBox status code, see supdrvIDC.
- * @param   iReq        The request code.
- * @param   pReq        The request.
- */
-int VBOXCALL SUPDrvDarwinIDC(uint32_t uReq, PSUPDRVIDCREQHDR pReq)
-{
-    PSUPDRVSESSION  pSession;
-
-    /*
-     * Some quick validations.
-     */
-    if (RT_UNLIKELY(!VALID_PTR(pReq)))
-        return VERR_INVALID_POINTER;
-
-    pSession = pReq->pSession;
-    if (pSession)
-    {
-        if (RT_UNLIKELY(!VALID_PTR(pSession)))
-            return VERR_INVALID_PARAMETER;
-        if (RT_UNLIKELY(pSession->pDevExt != &g_DevExt))
-            return VERR_INVALID_PARAMETER;
-    }
-    else if (RT_UNLIKELY(uReq != SUPDRV_IDC_REQ_CONNECT))
-        return VERR_INVALID_PARAMETER;
-
-    /*
-     * Do the job.
-     */
-    return supdrvIDC(uReq, &g_DevExt, pSession, pReq);
-}
-
-
-/**
- * Initializes any OS specific object creator fields.
- */
-void VBOXCALL   supdrvOSObjInitCreator(PSUPDRVOBJ pObj, PSUPDRVSESSION pSession)
-{
-    NOREF(pObj);
-    NOREF(pSession);
-}
-
-
-/**
- * Checks if the session can access the object.
- *
- * @returns true if a decision has been made.
- * @returns false if the default access policy should be applied.
- *
- * @param   pObj        The object in question.
- * @param   pSession    The session wanting to access the object.
- * @param   pszObjName  The object name, can be NULL.
- * @param   prc         Where to store the result when returning true.
- */
-bool VBOXCALL   supdrvOSObjCanAccess(PSUPDRVOBJ pObj, PSUPDRVSESSION pSession, const char *pszObjName, int *prc)
-{
-    NOREF(pObj);
-    NOREF(pSession);
-    NOREF(pszObjName);
-    NOREF(prc);
-    return false;
-}
-
-
-bool VBOXCALL   supdrvOSGetForcedAsyncTscMode(PSUPDRVDEVEXT pDevExt)
-{
-    NOREF(pDevExt);
-    return false;
-}
-
-
-/**
- * Converts a supdrv error code to a darwin error code.
- *
- * @returns corresponding darwin error code.
- * @param   rc  supdrv error code (SUPDRV_ERR_* defines).
- */
-static int VBoxDrvDarwinErr2DarwinErr(int rc)
-{
-    switch (rc)
-    {
-        case 0:                             return 0;
-        case SUPDRV_ERR_GENERAL_FAILURE:    return EACCES;
-        case SUPDRV_ERR_INVALID_PARAM:      return EINVAL;
-        case SUPDRV_ERR_INVALID_MAGIC:      return EILSEQ;
-        case SUPDRV_ERR_INVALID_HANDLE:     return ENXIO;
-        case SUPDRV_ERR_INVALID_POINTER:    return EFAULT;
-        case SUPDRV_ERR_LOCK_FAILED:        return ENOLCK;
-        case SUPDRV_ERR_ALREADY_LOADED:     return EEXIST;
-        case SUPDRV_ERR_PERMISSION_DENIED:  return EPERM;
-        case SUPDRV_ERR_VERSION_MISMATCH:   return ENOSYS;
-    }
-
-    return EPERM;
-}
-
-
-/** @todo move this to assembly where a simple "jmp printf" will to the trick. */
-RTDECL(int) SUPR0Printf(const char *pszFormat, ...)
-{
-    va_list     args;
-    char        szMsg[512];
-
-    va_start(args, pszFormat);
-    vsnprintf(szMsg, sizeof(szMsg) - 1, pszFormat, args);
-    va_end(args);
-
-    szMsg[sizeof(szMsg) - 1] = '\0';
-    printf("%s", szMsg);
-    return 0;
-}
-
-
-/*
- *
- * org_virtualbox_SupDrv
- *
- */
-
-
-/**
- * Initialize the object.
- */
-bool org_virtualbox_SupDrv::init(OSDictionary *pDictionary)
-{
-    LogFlow(("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)
-{
-    LogFlow(("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)
-{
-    LogFlow(("org_virtualbox_SupDrv::probe([%p])\n", this));
-    return IOService::probe(pProvider, pi32Score);
-}
-
-
-/**
- * Start this service.
- */
-bool org_virtualbox_SupDrv::start(IOService *pProvider)
-{
-    LogFlow(("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)
-{
-    LogFlow(("org_virtualbox_SupDrv::stop([%p], %p)\n", this, pProvider));
-    IOService::stop(pProvider);
-}
-
-
-/**
- * Termination request.
- *
- * @return  true if we're ok with shutting down now, false if we're not.
- * @param   fOptions        Flags.
- */
-bool org_virtualbox_SupDrv::terminate(IOOptionBits fOptions)
-{
-    bool fRc;
-    LogFlow(("org_virtualbox_SupDrv::terminate: reference_count=%d g_cSessions=%d (fOptions=%#x)\n",
-             KMOD_INFO_NAME.reference_count, ASMAtomicUoReadS32(&g_cSessions), fOptions));
-    if (    KMOD_INFO_NAME.reference_count != 0
-        ||  ASMAtomicUoReadS32(&g_cSessions))
-        fRc = false;
-    else
-        fRc = IOService::terminate(fOptions);
-    LogFlow(("org_virtualbox_SupDrv::terminate: returns %d\n", fRc));
-    return fRc;
-}
-
-
-/*
- *
- * org_virtualbox_SupDrvClient
- *
- */
-
-
-/**
- * Initializer called when the client opens the service.
- */
-bool org_virtualbox_SupDrvClient::initWithTask(task_t OwningTask, void *pvSecurityId, UInt32 u32Type)
-{
-    LogFlow(("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)
-{
-    LogFlow(("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;
-        }
-        LogFlow(("org_virtualbox_SupDrvClient::start: %p isn't org_virtualbox_SupDrv\n", pProvider));
-    }
-    return false;
 }
 
@@ -891 +983 @@
 IOReturn org_virtualbox_SupDrvClient::clientClose(void)
 {
-    LogFlow(("org_virtualbox_SupDrvClient::clientClose([%p])\n", this));
+    LogFlow(("org_virtualbox_SupDrvClient::clientClose([%p]) (cur pid=%d proc=%p)\n", this, RTProcSelf(), RTR0ProcHandleSelf()));
+    AssertMsg((RTR0PROCESS)m_Task == RTR0ProcHandleSelf(), ("%p %p\n", m_Task, RTR0ProcHandleSelf()));
+
+    /*
+     * Clean up the session if it's still around.
+     *
+     * We cannot rely 100% on close, and in the case of a dead client
+     * we'll end up hanging inside vm_map_remove() if we postpone it.
+     */
+    if (m_pSession)
+    {
+        sessionClose(RTProcSelf());
+        Assert(!m_pSession);
+    }
 
     m_pProvider = NULL;
@@ -901 +1006 @@
 
 /**
- * The client exits abnormally / forgets to do cleanups.
+ * The client exits abnormally / forgets to do cleanups. (logging)
  */
 IOReturn org_virtualbox_SupDrvClient::clientDied(void)
@@ -908 +1013 @@
              this, m_Task, RTR0ProcHandleSelf(), RTProcSelf()));
 
-    /*
-     * Do early session cleanup (if there is a session) so
-     * we avoid hanging in vm_map_remove().
-     */
-    const RTR0PROCESS   R0Process = (RTR0PROCESS)m_Task;
-    RTSPINLOCKTMP       Tmp = RTSPINLOCKTMP_INITIALIZER;
-    RTSpinlockAcquireNoInts(g_Spinlock, &Tmp);
-    for (unsigned i = 0; i < RT_ELEMENTS(g_apSessionHashTab); i++)
-    {
-        for (PSUPDRVSESSION pSession = g_apSessionHashTab[i]; pSession; pSession = pSession->pNextHash)
-        {
-            Log2(("pSession=%p R0Process=%p (=? %p)\n", pSession, pSession->R0Process, R0Process));
-            if (pSession->R0Process == R0Process)
-            {
-                /*
-                 * It is safe to leave the spinlock here; the session shouldn't be able
-                 * to go away while we're cleaning it up, changes to pNextHash will not
-                 * harm us, and new sessions can't possibly be added for this process.
-                 */
-                RTSpinlockReleaseNoInts(g_Spinlock, &Tmp);
-                supdrvCleanupSession(&g_DevExt, pSession);
-                RTSpinlockAcquireNoInts(g_Spinlock, &Tmp);
-            }
-        }
-    }
-    RTSpinlockReleaseNoInts(g_Spinlock, &Tmp);
-
-    /* IOUserClient::clientDied() calls close... */
+    /* IOUserClient::clientDied() calls clientClose, so we'll just do the work there. */
     return IOUserClient::clientDied();
 }
@@ -941 +1019 @@
 
 /**
- * Terminate the service (initiate the destruction).
+ * Terminate the service (initiate the destruction). (logging)
  */
 bool org_virtualbox_SupDrvClient::terminate(IOOptionBits fOptions)
@@ -951 +1029 @@
 
 /**
- * The final stage of the client service destruction.
+ * The final stage of the client service destruction. (logging)
  */
 bool org_virtualbox_SupDrvClient::finalize(IOOptionBits fOptions)
@@ -961 +1039 @@
 
 /**
- * Stop the client service.
+ * Stop the client service. (logging)
  */
 void org_virtualbox_SupDrvClient::stop(IOService *pProvider)

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

@@ -76 +76 @@
 
 
-int suplibOsInit(size_t cbReserve)
-{
-    /*
-     * Check if already initialized.
-     */
-    if (g_hDevice >= 0)
-        return VINF_SUCCESS;
-
-    /*
-     * Open the IOKit client first - The first step is finding the service.
-     */
-    mach_port_t MasterPort;
-    kern_return_t kr = IOMasterPort(MACH_PORT_NULL, &MasterPort);
-    if (kr != kIOReturnSuccess)
-    {
-        LogRel(("IOMasterPort -> %d\n", kr));
-        return VERR_GENERAL_FAILURE;
-    }
-
-    CFDictionaryRef ClassToMatch = IOServiceMatching(IOCLASS_NAME);
-    if (!ClassToMatch)
-    {
-        LogRel(("IOServiceMatching(\"%s\") failed.\n", IOCLASS_NAME));
-        return VERR_GENERAL_FAILURE;
-    }
-
-    /* Create an io_iterator_t for all instances of our drivers class that exist in the IORegistry. */
-    io_iterator_t Iterator;
-    kr = IOServiceGetMatchingServices(g_MasterPort, ClassToMatch, &Iterator);
-    if (kr != kIOReturnSuccess)
-    {
-        LogRel(("IOServiceGetMatchingServices returned %d\n", kr));
-        return VERR_GENERAL_FAILURE;
-    }
-
-    /* Get the first item in the iterator and release it. */
-    io_service_t ServiceObject = IOIteratorNext(Iterator);
-    IOObjectRelease(Iterator);
-    if (!ServiceObject)
-    {
-        LogRel(("SUP: Couldn't find any matches. The kernel module is probably not loaded.\n"));
-        return VERR_VM_DRIVER_NOT_INSTALLED;
-    }
-
-    /*
-     * Open the service.
-     * This will cause the user client class in SUPDrv-darwin.cpp to be instantiated.
-     */
-    kr = IOServiceOpen(ServiceObject, mach_task_self(), 0, &g_Connection);
-    IOObjectRelease(ServiceObject);
-    if (kr != kIOReturnSuccess)
-    {
-        LogRel(("SUP: IOServiceOpen returned %d. Driver open failed.\n", kr));
-        return VERR_VM_DRIVER_OPEN_ERROR;
-    }
-
-    /*
-     * Now, try open the BSD device.
+/**
+ * Opens the BSD device node.
+ *
+ * @returns VBox status code.
+ */
+static int suplibDarwinOpenDevice(void)
+{
+    /*
+     * Open the BSD device.
+     * This will connect to the session created when the SupDrvClient was
+     * started, so it has to be done after opening the service (IOC v9.1+).
      */
     g_hDevice = open(DEVICE_NAME, O_RDWR, 0);
@@ -148 +101 @@
         }
         LogRel(("SUP: Failed to open \"%s\", errno=%d, rc=%Vrc\n", DEVICE_NAME, errno, rc));
-
-        kr = IOServiceClose(g_Connection);
-        if (kr != kIOReturnSuccess)
-            LogRel(("Warning: IOServiceClose(%p) returned %d\n", g_Connection, kr));
         return rc;
     }
@@ -160 +109 @@
     if (fcntl(g_hDevice, F_SETFD, FD_CLOEXEC) != 0)
     {
-        int rc = errno;
-        LogRel(("suplibOSInit: setting FD_CLOEXEC failed, errno=%d\n", rc));
+        int err = errno;
+        int rc = RTErrConvertFromErrno(err);
+        LogRel(("suplibOSInit: setting FD_CLOEXEC failed, errno=%d (%Rrc)\n", err, rc));
         close(g_hDevice);
         g_hDevice = -1;
-        return RTErrConvertFromErrno(rc);
-    }
-
-    /*
-     * We're done.
-     */
+        return rc;
+    }
+
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Opens the IOKit service, instantiating org_virtualbox_SupDrvClient.
+ *
+ * @returns VBox status code.
+ */
+static int suplibDarwinOpenService(void)
+{
+    /*
+     * Open the IOKit client first - The first step is finding the service.
+     */
+    mach_port_t MasterPort;
+    kern_return_t kr = IOMasterPort(MACH_PORT_NULL, &MasterPort);
+    if (kr != kIOReturnSuccess)
+    {
+        LogRel(("IOMasterPort -> %d\n", kr));
+        return VERR_GENERAL_FAILURE;
+    }
+
+    CFDictionaryRef ClassToMatch = IOServiceMatching(IOCLASS_NAME);
+    if (!ClassToMatch)
+    {
+        LogRel(("IOServiceMatching(\"%s\") failed.\n", IOCLASS_NAME));
+        return VERR_GENERAL_FAILURE;
+    }
+
+    /* Create an io_iterator_t for all instances of our drivers class that exist in the IORegistry. */
+    io_iterator_t Iterator;
+    kr = IOServiceGetMatchingServices(g_MasterPort, ClassToMatch, &Iterator);
+    if (kr != kIOReturnSuccess)
+    {
+        LogRel(("IOServiceGetMatchingServices returned %d\n", kr));
+        return VERR_GENERAL_FAILURE;
+    }
+
+    /* Get the first item in the iterator and release it. */
+    io_service_t ServiceObject = IOIteratorNext(Iterator);
+    IOObjectRelease(Iterator);
+    if (!ServiceObject)
+    {
+        LogRel(("SUP: Couldn't find any matches. The kernel module is probably not loaded.\n"));
+        return VERR_VM_DRIVER_NOT_INSTALLED;
+    }
+
+    /*
+     * Open the service.
+     *
+     * This will cause the user client class in SUPDrv-darwin.cpp to be
+     * instantiated and create a session for this process.
+     */
+    kr = IOServiceOpen(ServiceObject, mach_task_self(), 0, &g_Connection);
+    IOObjectRelease(ServiceObject);
+    if (kr != kIOReturnSuccess)
+    {
+        LogRel(("SUP: IOServiceOpen returned %d. Driver open failed.\n", kr));
+        return VERR_VM_DRIVER_OPEN_ERROR;
+    }
+
+    return VINF_SUCCESS;
+}
+
+int suplibOsInit(size_t cbReserve)
+{
     NOREF(cbReserve);
-    return VINF_SUCCESS;
+
+    /*
+     * Check if already initialized.
+     */
+    if (g_hDevice >= 0)
+        return VINF_SUCCESS;
+
+    /*
+     * Do the job.
+     */
+    int rc = suplibDarwinOpenService();
+    if (RT_SUCCESS(rc))
+    {
+        rc = suplibDarwinOpenDevice();
+        if (RT_FAILURE(rc))
+        {
+            kern_return_t kr = IOServiceClose(g_Connection);
+            if (kr != kIOReturnSuccess)
+            {
+                LogRel(("Warning: IOServiceClose(%p) returned %d\n", g_Connection, kr));
+                AssertFailed();
+            }
+            g_Connection = NULL;
+        }
+    }
+
+    return rc;
 }
 
@@ -178 +217 @@
 {
     /*
-     * Check if we're initited at all.
-     */
-    if (g_hDevice >= 0)
-    {
-        if (close(g_hDevice))
-            AssertFailed();
-        g_hDevice = -1;
-    }
-
-    /*
-     * Close the connection to the IOService and destroy the connection handle.
+     * Close the connection to the IOService.
+     * This will cause the SUPDRVSESSION to be closed (starting IOC 9.1).
      */
     if (g_Connection)
@@ -201 +231 @@
     }
 
+    /*
+     * Check if we're initited at all.
+     */
+    if (g_hDevice >= 0)
+    {
+        if (close(g_hDevice))
+            AssertFailed();
+        g_hDevice = -1;
+    }
+
     return VINF_SUCCESS;
 }