Changeset 21461 in vbox for trunk/src

Timestamp:

Jul 9, 2009 10:13:37 PM (16 years ago)

Author:

vboxsync

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

49879

Message:

VBoxGuestLib: Implemented detection of physical page list support.

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

• GenericRequest.cpp (modified) (3 diffs)
• HGCM.cpp (modified) (1 diff)
• Init.cpp (modified) (10 diffs)
• Makefile.kmk (modified) (2 diffs)
• VBGLInternal.h (modified) (6 diffs)
• VMMDev.cpp (modified) (1 diff)
• VbglR0CanUsePhysPageList.cpp (added)

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

@@ -28 +28 @@
 {
     VMMDevRequestHeader *pReq;
-    int rc = VbglEnter ();
+    int rc = vbglR0Enter ();
 
     if (RT_FAILURE(rc))
@@ -65 +65 @@
 {
     RTCCPHYS physaddr;
-    int rc = VbglEnter ();
+    int rc = vbglR0Enter ();
 
     if (RT_FAILURE(rc))
@@ -91 +91 @@
 DECLVBGL(void) VbglGRFree (VMMDevRequestHeader *pReq)
 {
-    int rc = VbglEnter ();
+    int rc = vbglR0Enter ();
 
     if (RT_FAILURE(rc))

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

@@ -34 +34 @@
 #define VBGL_HGCM_ASSERTMsg AssertReleaseMsg
 
-int vbglHGCMInit (void)
-{
-    RTSemFastMutexCreate(&g_vbgldata.mutexHGCMHandle);
-
-    return VINF_SUCCESS;
-}
-
-int vbglHGCMTerminate (void)
+/**
+ * Initializes the HGCM VBGL bits.
+ *
+ * @return VBox status code.
+ */
+int vbglR0HGCMInit (void)
+{
+    return RTSemFastMutexCreate(&g_vbgldata.mutexHGCMHandle);
+}
+
+/**
+ * Initializes the HGCM VBGL bits.
+ *
+ * @return VBox status code.
+ */
+int vbglR0HGCMTerminate (void)
 {
     RTSemFastMutexDestroy(g_vbgldata.mutexHGCMHandle);
+    g_vbgldata.mutexHGCMHandle = NIL_RTSEMFASTMUTEX;
 
     return VINF_SUCCESS;

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

@@ -20 +20 @@
  */
 
-
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
 #define VBGL_DECL_DATA
 #include "VBGLInternal.h"
@@ -27 +29 @@
 #include <iprt/assert.h>
 
+/*******************************************************************************
+*   Global Variables                                                           *
+*******************************************************************************/
+/** The global VBGL instance data.  */
 VBGLDATA g_vbgldata;
 
+/**
+ * Used by vbglQueryVMMDevPort and VbglInit to try get the host feature mask and
+ * version information (g_vbgldata::hostVersion).
+ *
+ * This was first implemented by the host in 3.1 and we quietly ignore failures
+ * for that reason.
+ */
+static void vbglR0QueryHostVersion (void)
+{
+    VMMDevReqHostVersion *pReq;
+
+    int rc = VbglGRAlloc ((VMMDevRequestHeader **) &pReq, sizeof (*pReq), VMMDevReq_GetHostVersion);
+
+    if (RT_SUCCESS (rc))
+    {
+        rc = VbglGRPerform (&pReq->header);
+
+        if (RT_SUCCESS (rc))
+        {
+            g_vbgldata.hostVersion = *pReq;
+            Log (("vbglR0QueryHostVersion: %u.%u.%ur%u %#x\n",
+                  pReq->major, pReq->minor, pReq->build, pReq->revision, pReq->features));
+        }
+
+        VbglGRFree (&pReq->header);
+    }
+}
+
 #ifndef VBGL_VBOXGUEST
-/* The guest library uses lazy initialization for VMMDev port and memory,
+/**
+ * The guest library uses lazy initialization for VMMDev port and memory,
  * because these values are provided by the VBoxGuest driver and it might
  * be loaded later than other drivers.
+ *
  * The VbglEnter checks the current library status, tries to retrive these
  * values and fails if they are unavailable.
+ *
  */
 static void vbglQueryVMMDevPort (void)
@@ -46 +83 @@
     if (RT_SUCCESS(rc))
     {
+        /*
+         * Try query the port info.
+         */
         VBoxGuestPortInfo port;
 
@@ -58 +98 @@
 
             g_vbgldata.status = VbglStatusReady;
+
+            vbglR0QueryHostVersion();
         }
 
@@ -65 +107 @@
     dprintf (("vbglQueryVMMDevPort rc = %d\n", rc));
 }
-#endif
-
-int VbglEnter (void)
+#endif /* !VBGL_VBOXGUEST */
+
+/**
+ * Checks if VBGL has been initialized.
+ *
+ * The the client library, this will lazily complete the initialization.
+ *
+ * @return VINF_SUCCESS or VERR_VBGL_NOT_INITIALIZED.
+ */
+int vbglR0Enter (void)
 {
     int rc;
@@ -121 +170 @@
     int rc = VINF_SUCCESS;
 
+# ifdef RT_OS_WINDOWS /** @todo r=bird: this doesn't make sense. Is there something special going on on windows? */
     dprintf(("vbglInit: starts g_vbgldata.status %d\n", g_vbgldata.status));
 
@@ -129 +179 @@
         return rc;
     }
+# else
+    dprintf(("vbglInit: starts\n"));
+# endif
 
     rc = vbglInitCommon ();
@@ -138 +191 @@
 
         g_vbgldata.status = VbglStatusReady;
+
+        vbglR0QueryHostVersion();
     }
     else
@@ -175 +230 @@
         vbglQueryVMMDevPort ();
 
-#ifdef VBOX_WITH_HGCM
-        rc = vbglHGCMInit ();
-#endif /* VBOX_WITH_HGCM */
+# ifdef VBOX_WITH_HGCM
+        rc = vbglR0HGCMInit ();
+# endif /* VBOX_WITH_HGCM */
 
         if (RT_FAILURE(rc))
@@ -192 +247 @@
     vbglTerminateCommon ();
 
-#ifdef VBOX_WITH_HGCM
-    vbglHGCMTerminate ();
-#endif
+# ifdef VBOX_WITH_HGCM
+    vbglR0HGCMTerminate ();
+# endif
 
     return;

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

@@ -58 +58 @@
         VMMDev.cpp \
         HGCM.cpp \
-        VBoxCalls.c
+        VBoxCalls.c \
+        VbglR0CanUsePhysPageList.cpp
+
 
 #
@@ -73 +75 @@
         Init.cpp \
         VMMDev.cpp \
-        HGCMInternal.cpp
+        HGCMInternal.cpp \
+        VbglR0CanUsePhysPageList.cpp
 
 #

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

@@ -29 +29 @@
 #include <VBox/log.h>
 
-/** @todo dprintf() -> Log() */
+
+#ifdef RT_OS_WINDOWS /** @todo dprintf() -> Log() */
 #if (defined(DEBUG) && !defined(NO_LOGGING)) || defined(LOG_ENABLED)
 # define dprintf(a) RTLogBackdoorPrintf a
@@ -35 +36 @@
 # define dprintf(a) do {} while (0)
 #endif
+#else
+# define dprintf(a) Log(a)
+#endif
 
 #include "SysHlp.h"
 
-#pragma pack(4)
+#pragma pack(4) /** @todo r=bird: What do we need packing for here? None of these structures are shared between drivers AFAIK. */
 
 struct _VBGLPHYSHEAPBLOCK;
@@ -60 +64 @@
 };
 
+/**
+ * Global VBGL ring-0 data.
+ * Lives in VbglR0Init.cpp.
+ */
 typedef struct _VBGLDATA
 {
@@ -80 +88 @@
     /** @} */
 
+    /**
+     * The host version data.
+     */
+    VMMDevReqHostVersion hostVersion;
+
+
 #ifndef VBGL_VBOXGUEST
     /**
@@ -94 +108 @@
 } VBGLDATA;
 
+
 #pragma pack()
 
@@ -100 +115 @@
 #endif
 
-/* Check if library has been initialized before entering
- * a public library function.
+/**
+ * Internal macro for checking whether we can pass phyical page lists to the
+ * host.
+ *
+ * ASSUMES that vbglR0Enter has been called already.
  */
-int VbglEnter (void);
+#define VBGLR0_CAN_USE_PHYS_PAGE_LIST() \
+    ( !!(g_vbgldata.hostVersion.features & VMMDEV_HVF_HGCM_PHYS_PAGE_LIST) )
+
+int vbglR0Enter (void);
 
 #ifdef VBOX_WITH_HGCM
 # ifndef VBGL_VBOXGUEST
-/* Initialize HGCM subsystem. */
-int vbglHGCMInit (void);
-/* Terminate HGCM subsystem. */
-int vbglHGCMTerminate (void);
+int vbglR0HGCMInit (void);
+int vbglR0HGCMTerminate (void);
 # endif
 #endif /* VBOX_WITH_HGCM */

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

@@ -24 +24 @@
 DECLVBGL(int) VbglQueryVMMDevMemory (VMMDevMemory **ppVMMDevMemory)
 {
-    int rc = VbglEnter ();
+    int rc = vbglR0Enter ();
 
     if (RT_FAILURE(rc))