Changeset 60015 in vbox

Timestamp:

Mar 14, 2016 9:37:22 AM (9 years ago)

Author:

vboxsync

Message:

LsiLogic: Process requests from the BIOS on the worker thread and not on EMT because this breaks with disk encryption when setting the runtime error about missing DEKs @bugref{8277}

File:

• trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp (modified) (10 diffs)

trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp

@@ -341 +341 @@
     /** Flag whether the worker thread is sleeping. */
     volatile bool                    fWrkThreadSleeping;
+    /** Flag whether a request from the BIOS is pending which the
+     * worker thread needs to process. */
+    volatile bool                    fBiosReqPending;
+#if HC_ARCH_BITS == 64
     /** Alignment padding. */
-    bool                             afPadding2[HC_ARCH_BITS == 32 ? 1 : 5];
+    bool                             afPadding2[4];
+#endif
     /** List of tasks which can be redone. */
     R3PTRTYPE(volatile PLSILOGICREQ) pTasksRedoHead;
@@ -2143 +2148 @@
         lsilogicR3WarningISCSI(pThis->CTX_SUFF(pDevIns));
     }
-    else
+    else if (rc != VERR_VD_DEK_MISSING)
         lsilogicR3WarningUnknown(pThis->CTX_SUFF(pDevIns), rc);
 }
@@ -3836 +3841 @@
     Assert(cb == 1);
 
+    /*
+     * If there is already a request form the BIOS pending ignore this write
+     * because it should not happen.
+     */
+    if (ASMAtomicReadBool(&pThis->fBiosReqPending))
+        return VINF_SUCCESS;
+
     uint8_t iRegister = pThis->enmCtrlType == LSILOGICCTRLTYPE_SCSI_SPI
                       ? Port - LSILOGIC_BIOS_IO_PORT
@@ -3842 +3854 @@
     if (rc == VERR_MORE_DATA)
     {
-        rc = lsilogicR3PrepareBiosScsiRequest(pThis);
-        AssertRC(rc);
+        ASMAtomicXchgBool(&pThis->fBiosReqPending, true);
+        /* Send a notifier to the PDM queue that there are pending requests. */
+        PPDMQUEUEITEMCORE pItem = PDMQueueAlloc(pThis->CTX_SUFF(pNotificationQueue));
+        AssertMsg(pItem, ("Allocating item for queue failed\n"));
+        PDMQueueInsert(pThis->CTX_SUFF(pNotificationQueue), (PPDMQUEUEITEMCORE)pItem);
     }
     else if (RT_FAILURE(rc))
@@ -4183 +4198 @@
 
         ASMAtomicWriteBool(&pThis->fWrkThreadSleeping, false);
+
+        /* Check whether there is a BIOS request pending and process it first. */
+        if (ASMAtomicReadBool(&pThis->fBiosReqPending))
+        {
+            rc = lsilogicR3PrepareBiosScsiRequest(pThis);
+            AssertRC(rc);
+            ASMAtomicXchgBool(&pThis->fBiosReqPending, false);
+        }
 
         /* Only process request which arrived before we received the notification. */
@@ -4302 +4325 @@
 static void lsilogicR3Kick(PLSILOGICSCSI pThis)
 {
+    if (   pThis->VBoxSCSI.fBusy
+        && !pThis->fBiosReqPending)
+        pThis->fBiosReqPending = true;
+
     if (pThis->fNotificationSent)
     {
@@ -4309 +4336 @@
         PDMQueueInsert(pThis->CTX_SUFF(pNotificationQueue), (PPDMQUEUEITEMCORE)pItem);
     }
-    else if (pThis->VBoxSCSI.fBusy)
-    {
-        /* The BIOS had a request active when we got suspended. Resume it. */
-        int rc = lsilogicR3PrepareBiosScsiRequest(pThis);
-        AssertRC(rc);
-    }
-
 }
 
@@ -4997 +5017 @@
                     pThis->uRequestQueueNextEntryFreeWrite++;
                     pThis->uRequestQueueNextEntryFreeWrite %= pThis->cRequestQueueEntries;
-
-                    pThis->fNotificationSent = true;
                 }
                 else
@@ -5006 +5024 @@
                 }
 
+                pThis->fNotificationSent = true;
+
                 pFree = pLsiReq;
                 pLsiReq = pLsiReq->pRedoNext;
@@ -5227 +5247 @@
     pThis->hTaskCache  = NIL_RTMEMCACHE;
     pThis->hEvtProcess = NIL_SUPSEMEVENT;
+    pThis->fBiosReqPending = false;
     RTListInit(&pThis->ListMemRegns);