Changeset 108867 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Apr 7, 2025 10:32:44 AM (5 weeks ago)

Author:

vboxsync

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

168317

Message:

VMM/GIC: bugref:10877 GIC ITS command-queue, work-in-progress.

File:

• trunk/src/VBox/VMM/VMMAll/GITSAll.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/VMMAll/GITSAll.cpp

@@ -51 +51 @@
 #define GITS_IS_REG_IN_RANGE(a_offReg, a_offFirst, a_cbRegion)    ((uint32_t)(a_offReg) - (a_offFirst) < (a_cbRegion))
 
+/** Acquire the device critical section. */
+#define GITS_CRIT_SECT_ENTER(a_pDevIns) \
+    do \
+    { \
+        int const rcLock = PDMDevHlpCritSectEnter(pDevIns, pDevIns->pCritSectRoR3, VINF_SUCCESS); \
+        PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, pDevIns->pCritSectRoR3, rcLock); \
+    } while(0)
+
+/** Release the device critical section. */
+#define GITS_CRIT_SECT_LEAVE(a_pDevIns)         PDMDevHlpCritSectLeave((a_pDevIns), (a_pDevIns)->CTX_SUFF(pCritSectRo))
+
+/** Returns whether the critical section is held. */
+#define GITS_CRIT_SECT_IS_OWNER(a_pDevIns)      PDMDevHlpCritSectIsOwner((a_pDevIns), (a_pDevIns)->CTX_SUFF(pCritSectRo))
+
 
 /*********************************************************************************************************************************
@@ -162 +176 @@
 static void gitsCmdQueueThreadWakeUpIfNeeded(PPDMDEVINS pDevIns, PGITSDEV pGitsDev)
 {
-    Assert(PDMDevHlpCritSectIsOwner(pDevIns, pDevIns->CTX_SUFF(pCritSectRo)));
+    Assert(GITS_CRIT_SECT_IS_OWNER(pDevIns));
     if (    gitsCmdQueueCanProcessRequests(pGitsDev)
         && !gitsCmdQueueIsEmpty(pGitsDev))
@@ -454 +468 @@
 {
     /* Hold the critical section as we could be accessing the device state simultaneously with MMIO accesses. */
-    int const rcLock = PDMDevHlpCritSectEnter(pDevIns, pDevIns->pCritSectRoR3, VINF_SUCCESS);
-    PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, pDevIns->pCritSectRoR3, rcLock);
+    GITS_CRIT_SECT_ENTER(pDevIns);
 
     if (gitsCmdQueueCanProcessRequests(pGitsDev))
@@ -474 +487 @@
 
             /* Temporarily leave the critical section while reading (a potentially large number of) commands from guest memory. */
-            PDMDevHlpCritSectLeave(pDevIns, pDevIns->pCritSectRoR3);
+            GITS_CRIT_SECT_LEAVE(pDevIns);
 
             int      rc;
@@ -500 +513 @@
 
             /* Re-acquire the critical section as we now need to modify device state. */
-            int const rcLock2 = PDMDevHlpCritSectEnter(pDevIns, pDevIns->pCritSectRoR3, VINF_SUCCESS);
-            PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, pDevIns->pCritSectRoR3, rcLock2);
+            GITS_CRIT_SECT_ENTER(pDevIns);
 
             /*
@@ -515 +527 @@
                 }
 
-                PDMDevHlpCritSectLeave(pDevIns, pDevIns->pCritSectRoR3);
+                GITS_CRIT_SECT_LEAVE(pDevIns);
                 return VINF_SUCCESS;
             }
@@ -525 +537 @@
     }
 
-    PDMDevHlpCritSectLeave(pDevIns, pDevIns->pCritSectRoR3);
+    GITS_CRIT_SECT_LEAVE(pDevIns);
     return VINF_SUCCESS;
 }