Changeset 20829 in vbox for trunk

Timestamp:

Jun 23, 2009 1:00:16 PM (16 years ago)

Author:

vboxsync

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

48968

Message:

Check and assume PDM locking is performed when calling the APIC interface.

File:

• trunk/src/VBox/Devices/PC/DevAPIC.cpp (modified) (12 diffs)

trunk/src/VBox/Devices/PC/DevAPIC.cpp

@@ -591 +591 @@
 {
     APICDeviceInfo *dev = PDMINS_2_DATA(pDevIns, APICDeviceInfo *);
+    Assert(PDMCritSectIsOwner(dev->CTX_SUFF(pCritSect)));
     APICState *s = getLapic(dev); /** @todo fix interface */
     Log(("cpu_set_apic_base: %016RX64\n", val));
@@ -698 +699 @@
 {
     APICDeviceInfo *dev = PDMINS_2_DATA(pDevIns, APICDeviceInfo *);
+    Assert(PDMCritSectIsOwner(dev->CTX_SUFF(pCritSect)));
     APICState *s = getLapic(dev); /** @todo fix interface */
     LogFlow(("apicGetBase: %016llx\n", (uint64_t)s->apicbase));
@@ -706 +708 @@
 {
     APICDeviceInfo *dev = PDMINS_2_DATA(pDevIns, APICDeviceInfo *);
+    Assert(PDMCritSectIsOwner(dev->CTX_SUFF(pCritSect)));
     APICState *s = getLapicById(dev, idCpu);
     LogFlow(("apicSetTPR: val=%#x (trp %#x -> %#x)\n", val, s->tpr, val));
@@ -713 +716 @@
 PDMBOTHCBDECL(uint8_t) apicGetTPR(PPDMDEVINS pDevIns, VMCPUID idCpu)
 {
+    /* We don't perform any locking here as that would cause a lot of contention for VT-x/AMD-V. */
     APICDeviceInfo *dev = PDMINS_2_DATA(pDevIns, APICDeviceInfo *);
     APICState *s = getLapicById(dev, idCpu);
@@ -733 +737 @@
 {
     APICDeviceInfo *dev = PDMINS_2_DATA(pDevIns, APICDeviceInfo *);
+    Assert(PDMCritSectIsOwner(dev->CTX_SUFF(pCritSect)));
     int rc = VINF_SUCCESS;
 
@@ -838 +843 @@
 {
     APICDeviceInfo *dev = PDMINS_2_DATA(pDevIns, APICDeviceInfo *);
+    Assert(PDMCritSectIsOwner(dev->CTX_SUFF(pCritSect)));
 
     if (dev->enmVersion < PDMAPICVERSION_X2APIC)
@@ -928 +934 @@
 {
     APICDeviceInfo *dev = PDMINS_2_DATA(pDevIns, APICDeviceInfo *);
+    Assert(PDMCritSectIsOwner(dev->CTX_SUFF(pCritSect)));
     LogFlow(("apicBusDeliverCallback: pDevIns=%p u8Dest=%#x u8DestMode=%#x u8DeliveryMode=%#x iVector=%#x u8Polarity=%#x u8TriggerMode=%#x\n",
              pDevIns, u8Dest, u8DestMode, u8DeliveryMode, iVector, u8Polarity, u8TriggerMode));
@@ -1017 +1024 @@
     if (!dev)
         return false;
+
+    /* We don't perform any locking here as that would cause a lot of contention for VT-x/AMD-V. */
+
     APICState *s = getLapic(dev); /** @todo fix interface */
 
@@ -1261 +1271 @@
     }
 
-    APIC_LOCK(dev, VERR_INTERNAL_ERROR);
+    Assert(PDMCritSectIsOwner(dev->CTX_SUFF(pCritSect)));
 
     APICState *s = getLapic(dev);  /** @todo fix interface */
@@ -1268 +1278 @@
     if (!(s->spurious_vec & APIC_SV_ENABLE)) {
         Log(("CPU%d: apic_get_interrupt: returns -1 (APIC_SV_ENABLE)\n", s->phys_id));
-        intno = -1;
-        goto done;
+        return -1;
     }
 
@@ -1276 +1285 @@
     if (intno < 0) {
         Log(("CPU%d: apic_get_interrupt: returns -1 (irr)\n", s->phys_id));
-        intno = -1;
-        goto done;
+        return -1;
     }
     if (s->tpr && (uint32_t)intno <= s->tpr) {
         Log(("apic_get_interrupt: returns %d (sp)\n", s->spurious_vec & 0xff));
-        intno = s->spurious_vec & 0xff;
-        goto done;
+        return s->spurious_vec & 0xff;
     }
     reset_bit(s->irr, intno);
@@ -1288 +1295 @@
     apic_update_irq(dev, s);
     LogFlow(("CPU%d: apic_get_interrupt: returns %d\n", s->phys_id, intno));
- done:
-    APIC_UNLOCK(dev);
     return intno;
 }