Changeset 68568 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Aug 31, 2017 12:10:33 PM (8 years ago)

Author:

vboxsync

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

117785

Message:

merging vbglioc r117733: Moved the ldi_open_by_name stuff to the IDC client code as it's simpler to manage from there, and probably safer.

Location:

trunk/src/VBox/Additions/common

Files:

• VBoxGuest/VBoxGuest-solaris.c (modified) (4 diffs)
• VBoxGuestLib/Makefile.kmk (modified) (1 diff)
• VBoxGuestLib/VBoxGuestR0LibIdc-solaris.cpp (added)
• VBoxGuestLib/VBoxGuestR0LibIdc-win.cpp (modified) (2 diffs)
• VBoxGuestLib/VBoxGuestR0LibInternal.h (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c

@@ -190 +190 @@
 /** The IRQ high-level Mutex. */
 static kmutex_t             g_HighLevelIrqMtx;
-/** Layered device handle for kernel keep-attached opens */
-static ldi_handle_t         g_LdiHandle = NULL;
-/** Ref counting for IDCOpen calls */
-static uint64_t             g_cLdiOpens = 0;
-/** The Mutex protecting the LDI handle in IDC opens */
-static kmutex_t             g_LdiMtx;
 /** Whether soft-ints are setup. */
 static bool                 g_fSoftIntRegistered = false;
@@ -220 +214 @@
             cmn_err(CE_NOTE, "failed to initialize driver logging rc=%d!\n", rc);
 
-        mutex_init(&g_LdiMtx, NULL, MUTEX_DRIVER, NULL);
-
         /*
          * Prevent module autounloading.
@@ -260 +252 @@
 
     if (!rc)
-    {
-        mutex_destroy(&g_LdiMtx);
         RTR0Term();
-    }
     return rc;
 }
@@ -786 +775 @@
         else if (uReq == VBGL_IOCTL_IDC_CONNECT)
         {
-            /* Reference ourselves to make sure we don't go away.
-               Note! Would be better if the IDC code did this. */
-            mutex_enter(&g_LdiMtx);
-            if (g_LdiHandle)
-            {
-                ++g_cLdiOpens;
-                rc = VINF_SUCCESS;
-            }
-            else
-            {
-                ldi_ident_t DevIdent = ldi_ident_from_anon();
-                rc = ldi_open_by_name(VBOXGUEST_DEVICE_NAME, FREAD, kcred, &g_LdiHandle, DevIdent);
-                ldi_ident_release(DevIdent);
-                if (!rc)
-                    ++g_cLdiOpens;
-                else
-                {
-                    LogRel(("VBoxGuestIDCOpen: ldi_open_by_name failed. rc=%d\n", rc));
-                    rc = VERR_OPEN_FAILED;
-                }
-            }
-            mutex_exit(&g_LdiMtx);
-
+            rc = VGDrvCommonCreateKernelSession(&g_DevExt, &pSession);
             if (RT_SUCCESS(rc))
             {
-                rc = VGDrvCommonCreateKernelSession(&g_DevExt, &pSession);
-                if (RT_SUCCESS(rc))
-                {
-                    rc = VGDrvCommonIoCtl(uReq, &g_DevExt, pSession, pReqHdr, cbReq);
-                    if (RT_FAILURE(rc))
-                        VGDrvCommonCloseSession(&g_DevExt, pSession);
-                }
+                rc = VGDrvCommonIoCtl(uReq, &g_DevExt, pSession, pReqHdr, cbReq);
+                if (RT_FAILURE(rc))
+                    VGDrvCommonCloseSession(&g_DevExt, pSession);
             }
         }
         else
             rc = VERR_INVALID_HANDLE;
-
-        /*
-         * Dereference the driver on disconnect and failed connect.
-         */
-        if (RT_UNLIKELY(   (   uReq == VBGL_IOCTL_IDC_CONNECT
-                            && RT_FAILURE(rc))
-                        || (   uReq == VBGL_IOCTL_IDC_DISCONNECT
-                            && RT_SUCCESS(rc)) ))
-        {
-            mutex_enter(&g_LdiMtx);
-            if (g_cLdiOpens > 0)
-                --g_cLdiOpens;
-            if (   g_cLdiOpens == 0
-                && g_LdiHandle)
-            {
-                ldi_close(g_LdiHandle, FREAD, kcred);
-                g_LdiHandle = NULL;
-            }
-            mutex_exit(&g_LdiMtx);
-        }
     }
     else

trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk

@@ -73 +73 @@
         HGCM.cpp \
         VbglR0CanUsePhysPageList.cpp
-VBoxGuestR0Lib_SOURCES.win = VBoxGuestR0LibIdc-win.cpp
-VBoxGuestR0Lib_SOURCES.os2 = VBoxGuestR0LibIdc-os2.cpp
-ifn1of ($(KBUILD_TARGET), win os2)
- VBoxGuestR0Lib_SOURCES += VBoxGuestR0LibIdc-unix.cpp
+VBoxGuestR0Lib_SOURCES.os2     = VBoxGuestR0LibIdc-os2.cpp
+VBoxGuestR0Lib_SOURCES.solaris = VBoxGuestR0LibIdc-solaris.cpp
+VBoxGuestR0Lib_SOURCES.win     = VBoxGuestR0LibIdc-win.cpp
+ifn1of ($(KBUILD_TARGET), os2 solaris win)
+ VBoxGuestR0Lib_SOURCES       += VBoxGuestR0LibIdc-unix.cpp
 endif
 

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibIdc-win.cpp

@@ -138 +138 @@
          */
         rc = vbglR0IdcNtCallInternal(pDeviceObject, pFileObject, VBGL_IOCTL_IDC_CONNECT, &pReq->Hdr);
-        if (RT_SUCCESS(rc))
+        if (RT_SUCCESS(rc) && RT_SUCCESS(pReq->Hdr.rc))
         {
             pHandle->s.pDeviceObject = pDeviceObject;
@@ -161 +161 @@
     PFILE_OBJECT pFileObject = pHandle->s.pFileObject;
     int rc = vbglR0IdcNtCallInternal(pHandle->s.pDeviceObject, pFileObject, VBGL_IOCTL_IDC_DISCONNECT, &pReq->Hdr);
-    if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(rc) && RT_SUCCESS(pReq->Hdr.rc))
     {
         pHandle->s.pDeviceObject = NULL;

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

@@ -33 +33 @@
 #ifdef RT_OS_WINDOWS
 # include <iprt/nt/ntddk.h>
+#elif defined(RT_OS_SOLARIS)
+# include <sys/conf.h>
+# include <sys/sunldi.h>
+# include <sys/file.h>
+# undef u /* /usr/include/sys/user.h:249:1 is where this is defined to (curproc->p_user). very cool. */
 #endif
 
@@ -43 +48 @@
     /** Pointer to the session handle. */
     void           *pvSession;
-# ifdef RT_OS_WINDOWS
+#ifdef RT_OS_WINDOWS
     /** Pointer to the NT device object. */
     PDEVICE_OBJECT  pDeviceObject;
     /** Pointer to the NT file object. */
     PFILE_OBJECT    pFileObject;
-# endif
+#elif defined(RT_OS_SOLARIS)
+    /** LDI device handle to keep the device attached. */
+    ldi_handle_t    hDev;
+#endif
 };
 /** Indicate that the structure is present. */