Changeset 95164 in vbox for trunk/src/VBox

Timestamp:

Jun 1, 2022 2:10:36 PM (3 years ago)

Author:

vboxsync

Message:

Devices/Graphics: avoid deadlock on power off.

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp

@@ -6942 +6942 @@
     if (pThisCC->svga.pFIFOIOThread)
     {
+        /* Hack around a deadlock:
+         * - the caller holds the device critsect;
+         * - FIFO thread may attempt to enter the critsect too (when raising an IRQ).
+         */
+        PDMDevHlpCritSectLeave(pDevIns, &pThis->CritSect);
+
         int rc = vmsvgaR3RunExtCmdOnFifoThread(pDevIns, pThis, pThisCC,  VMSVGA_FIFO_EXTCMD_POWEROFF,
                                                NULL /*pvParam*/, 30000 /*ms*/);
         AssertLogRelRC(rc);
+
+        int const rcLock = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
+        PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, &pThis->CritSect, rcLock);
     }
 }