Changeset 75588 in vbox

Timestamp:

Nov 19, 2018 6:07:03 PM (6 years ago)

Author:

vboxsync

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

126756

Message:

VBoxGuest: Make use of new IRQ ACK port when present.

Location:

trunk

Files:

• include/VBox/VBoxGuestLib.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp (modified) (10 diffs)
• src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibInit.cpp (modified) (5 diffs)

trunk/include/VBox/VBoxGuestLib.h

@@ -107 +107 @@
  * @return VBox status code.
  */
-DECLR0VBGL(int)     VbglR0InitPrimary(RTIOPORT portVMMDev, struct VMMDevMemory *pVMMDevMemory);
+DECLR0VBGL(int)     VbglR0InitPrimary(RTIOPORT portVMMDev, VMMDevMemory *pVMMDevMemory, uint32_t *pfFeatures);
 
 /**

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp

@@ -986 +986 @@
     pDevExt->hGuestMappings = NIL_RTR0MEMOBJ;
     pDevExt->EventSpinlock = NIL_RTSPINLOCK;
+    pDevExt->fHostFeatures = 0;
     pDevExt->pIrqAckEvents = NULL;
     pDevExt->PhysIrqAckEvents = NIL_RTCCPHYS;
@@ -1127 +1128 @@
      */
     pDevExt->IOPortBase = IOPortBase;
-    rc = VbglR0InitPrimary(pDevExt->IOPortBase, (VMMDevMemory *)pDevExt->pVMMDevMemory);
+    rc = VbglR0InitPrimary(pDevExt->IOPortBase, (VMMDevMemory *)pDevExt->pVMMDevMemory, &pDevExt->fHostFeatures);
     if (RT_SUCCESS(rc))
     {
-        rc = VbglR0GRAlloc((VMMDevRequestHeader **)&pDevExt->pIrqAckEvents, sizeof(VMMDevEvents), VMMDevReq_AcknowledgeEvents);
+        VMMDevRequestHeader *pAckReq = NULL;
+        rc = VbglR0GRAlloc(&pAckReq, sizeof(VMMDevEvents), VMMDevReq_AcknowledgeEvents);
         if (RT_SUCCESS(rc))
         {
-            pDevExt->PhysIrqAckEvents = VbglR0PhysHeapGetPhysAddr(pDevExt->pIrqAckEvents);
+            pDevExt->PhysIrqAckEvents = VbglR0PhysHeapGetPhysAddr(pAckReq);
             Assert(pDevExt->PhysIrqAckEvents != 0);
+            ASMCompilerBarrier(); /* linux + solaris already have IRQs hooked up at this point, so take care. */
+            pDevExt->pIrqAckEvents = (VMMDevEvents *)pAckReq;
 
             rc = vgdrvReportGuestInfo(enmOSType);
@@ -1262 +1266 @@
 
     /*
+     * No more IRQs.
+     */
+    pDevExt->pIrqAckEvents = NULL; /* Will be freed by VbglR0TerminatePrimary. */
+    ASMAtomicWriteU32(&pDevExt->fHostFeatures, 0);
+
+    /*
      * Cleanup all the other resources.
      */
@@ -1279 +1289 @@
     pDevExt->pVMMDevMemory = NULL;
     pDevExt->IOPortBase = 0;
-    pDevExt->pIrqAckEvents = NULL; /* Freed by VbglR0TerminatePrimary. */
 }
 
@@ -1583 +1592 @@
  * Destroys the VBoxGuest device extension.
  *
- * The native code should call this before the driver is loaded,
+ * The native code should call this before the driver is unloaded,
  * but don't call this on shutdown.
  *
@@ -4362 +4371 @@
 bool VGDrvCommonISR(PVBOXGUESTDEVEXT pDevExt)
 {
-    VMMDevEvents volatile  *pReq                  = pDevExt->pIrqAckEvents;
+    VMMDevEvents volatile  *pReq;
     bool                    fMousePositionChanged = false;
     int                     rc                    = 0;
@@ -4371 +4380 @@
      * Make sure we've initialized the device extension.
      */
-    if (RT_UNLIKELY(!pReq))
+    if (RT_LIKELY(pDevExt->fHostFeatures & VMMDEV_HVF_FAST_IRQ_ACK))
+        pReq = NULL;
+    else if (RT_LIKELY((pReq = pDevExt->pIrqAckEvents) != NULL))
+    { /* likely */ }
+    else
         return false;
 
@@ -4383 +4396 @@
     {
         /*
-         * Acknowlegde events.
+         * Acknowledge events.
          * We don't use VbglR0GRPerform here as it may take another spinlocks.
          */
-        pReq->header.rc = VERR_INTERNAL_ERROR;
-        pReq->events    = 0;
-        ASMCompilerBarrier();
-        ASMOutU32(pDevExt->IOPortBase + VMMDEV_PORT_OFF_REQUEST, (uint32_t)pDevExt->PhysIrqAckEvents);
-        ASMCompilerBarrier();   /* paranoia */
-        if (RT_SUCCESS(pReq->header.rc))
-        {
-            uint32_t        fEvents = pReq->events;
-
+        uint32_t fEvents;
+        if (!pReq)
+        {
+            fEvents = ASMInU32(pDevExt->IOPortBase + VMMDEV_PORT_OFF_REQUEST_FAST);
+            ASMCompilerBarrier();   /* paranoia */
+            rc = fEvents != UINT32_MAX ? VINF_SUCCESS : VERR_INTERNAL_ERROR;
+        }
+        else
+        {
+            pReq->header.rc = VERR_INTERNAL_ERROR;
+            pReq->events    = 0;
+            ASMCompilerBarrier();
+            ASMOutU32(pDevExt->IOPortBase + VMMDEV_PORT_OFF_REQUEST, (uint32_t)pDevExt->PhysIrqAckEvents);
+            ASMCompilerBarrier();   /* paranoia */
+            fEvents = pReq->events;
+            rc = pReq->header.rc;
+        }
+        if (RT_SUCCESS(rc))
+        {
             Log3(("VGDrvCommonISR: acknowledge events succeeded %#RX32\n", fEvents));
 
@@ -4442 +4465 @@
         }
         else /* something is serious wrong... */
-            Log(("VGDrvCommonISR: acknowledge events failed rc=%Rrc (events=%#x)!!\n",
-                 pReq->header.rc, pReq->events));
+            Log(("VGDrvCommonISR: acknowledge events failed rc=%Rrc (events=%#x)!!\n", rc, fEvents));
     }
     else
@@ -4479 +4501 @@
     }
 
-    Assert(rc == 0);
-    NOREF(rc);
+    AssertMsg(rc == 0, ("rc=%#x (%d)\n", rc, rc));
     return fOurIrq;
 }

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h

@@ -151 +151 @@
      * semaphores as well as the event acking in the ISR. */
     RTSPINLOCK                  EventSpinlock;
+    /** Host feature flags (VMMDEV_HVF_XXX).   */
+    uint32_t                    fHostFeatures;
     /** Preallocated VMMDevEvents for the IRQ handler. */
     VMMDevEvents               *pIrqAckEvents;

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibInit.cpp

@@ -184 +184 @@
 #ifdef VBGL_VBOXGUEST
 
-DECLVBGL(int) VbglR0InitPrimary(RTIOPORT portVMMDev, VMMDevMemory *pVMMDevMemory)
+DECLR0VBGL(int) VbglR0InitPrimary(RTIOPORT portVMMDev, VMMDevMemory *pVMMDevMemory, uint32_t *pfFeatures)
 {
     int rc;
@@ -209 +209 @@
 
         vbglR0QueryHostVersion();
+        *pfFeatures = g_vbgldata.hostVersion.features;
         return VINF_SUCCESS;
     }
@@ -216 +217 @@
 }
 
-DECLVBGL(void) VbglR0TerminatePrimary(void)
+DECLR0VBGL(void) VbglR0TerminatePrimary(void)
 {
     vbglR0TerminateCommon();
@@ -224 +225 @@
 #else /* !VBGL_VBOXGUEST */
 
-DECLVBGL(int) VbglR0InitClient(void)
+DECLR0VBGL(int) VbglR0InitClient(void)
 {
     int rc;
@@ -269 +270 @@
 }
 
-DECLVBGL(void) VbglR0TerminateClient(void)
+DECLR0VBGL(void) VbglR0TerminateClient(void)
 {
 # ifdef VBOX_WITH_HGCM