Changeset 60516 in vbox for trunk

Timestamp:

Apr 15, 2016 10:33:13 AM (9 years ago)

Author:

vboxsync

Message:

VMM/APIC: Add some profile statistics.

Location:

trunk/src/VBox

Files:

• Devices/testcase/tstDeviceStructSizeRC.cpp (modified) (1 diff)
• VMM/VMMAll/APICAll.cpp (modified) (9 diffs)
• VMM/VMMR3/APIC.cpp (modified) (3 diffs)
• VMM/include/APICInternal.h (modified) (1 diff)

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

@@ -792 +792 @@
     GEN_CHECK_OFF(APICCPU, StatMsrWriteR3);
     GEN_CHECK_OFF(APICCPU, StatMsrWriteRC);
+    GEN_CHECK_OFF(APICCPU, StatUpdatePendingIntrs);
+    GEN_CHECK_OFF(APICCPU, StatPostInterrupt);
 #else
     /* PC/DevAPIC.cpp */

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

@@ -1081 +1081 @@
 static void apicUpdatePpr(PVMCPU pVCpu)
 {
-    VMCPU_ASSERT_EMT_OR_NOT_RUNNING(pVCpu);
+    VMCPU_ASSERT_EMT(pVCpu);
 
     /* See Intel spec 10.8.3.1 "Task and Processor Priorities". */
@@ -1103 +1103 @@
 static uint8_t apicGetPpr(PVMCPU pVCpu)
 {
-    VMCPU_ASSERT_EMT_OR_NOT_RUNNING(pVCpu);
+    VMCPU_ASSERT_EMT(pVCpu);
 
     /*
@@ -2394 +2394 @@
 {
     Assert(pVCpu);
+    Assert(uVector > XAPIC_ILLEGAL_VECTOR_END);
 
     PCAPIC   pApic    = VM_TO_APIC(pVCpu->CTX_SUFF(pVM));
     PAPICCPU pApicCpu = VMCPU_TO_APICCPU(pVCpu);
+
+    STAM_PROFILE_START(&pApicCpu->StatPostInterrupt, a);
+
     /* Validate the vector. See Intel spec. 10.5.2 "Valid Interrupt Vectors". */
     if (RT_LIKELY(uVector > XAPIC_ILLEGAL_VECTOR_END))
@@ -2406 +2410 @@
             apicSetVectorInPib(CTX_SUFF(pApicCpu->pvApicPib), uVector);
             bool const fAlreadySet = apicSetNotificationBitInPib(CTX_SUFF(pApicCpu->pvApicPib));
-            if (fAlreadySet)
-                return;
-
-            if (pApic->fPostedIntrsEnabled)
-            { /** @todo posted-interrupt call to hardware */ }
-            else
-                APICSetInterruptFF(pVCpu, PDMAPICIRQ_HARDWARE);
+            if (!fAlreadySet)
+            {
+                if (pApic->fPostedIntrsEnabled)
+                { /** @todo posted-interrupt call to hardware */ }
+                else
+                    APICSetInterruptFF(pVCpu, PDMAPICIRQ_HARDWARE);
+            }
         }
         else
@@ -2422 +2426 @@
             apicSetVectorInPib(&pApicCpu->ApicPibLevel.aVectorBitmap[0], uVector);
             bool const fAlreadySet = apicSetNotificationBitInPib(&pApicCpu->ApicPibLevel.aVectorBitmap[0]);
-            if (fAlreadySet)
-                return;
-
-            APICSetInterruptFF(pVCpu, PDMAPICIRQ_HARDWARE);
+            if (!fAlreadySet)
+                APICSetInterruptFF(pVCpu, PDMAPICIRQ_HARDWARE);
         }
     }
     else
         apicSetError(pVCpu, XAPIC_ESR_RECV_ILLEGAL_VECTOR);
+
+    STAM_PROFILE_STOP(&pApicCpu->StatPostInterrupt, a);
 }
 
@@ -2537 +2541 @@
     PAPIC pApic = VM_TO_APIC(CTX_SUFF(pVCpu->pVM));
     Assert(!pApic->fVirtApicRegsEnabled);
+    NOREF(pApic);
 
     PXAPICPAGE pXApicPage = VMCPU_TO_XAPICPAGE(pVCpu);
@@ -2567 +2572 @@
     PAPIC pApic = VM_TO_APIC(CTX_SUFF(pVCpu->pVM));
     Assert(!pApic->fVirtApicRegsEnabled);
+    NOREF(pApic);
 
     PXAPICPAGE pXApicPage = VMCPU_TO_XAPICPAGE(pVCpu);
@@ -2591 +2597 @@
     PXAPICPAGE pXApicPage = VMCPU_TO_XAPICPAGE(pVCpu);
 
+    STAM_PROFILE_START(&pApicCpu->StatUpdatePendingIntrs, a);
+
     /* Update edge-triggered pending interrupts. */
     for (;;)
@@ -2628 +2636 @@
         }
     }
+
+    STAM_PROFILE_STOP(&pApicCpu->StatUpdatePendingIntrs, a);
 }
 

trunk/src/VBox/VMM/VMMR3/APIC.cpp

@@ -411 +411 @@
     pHlp->pfnPrintf(pHlp, "    Recv Illegal Vector         = %RTbool\n",  pXApicPage->esr.u.fRcvdIllegalVector);
     pHlp->pfnPrintf(pHlp, "    Illegal Register Address    = %RTbool\n",  pXApicPage->esr.u.fIllegalRegAddr);
-    pHlp->pfnPrintf(pHlp, "  ICR Low                       = %#x\n",      pXApicPage->icr_lo.all);
+    pHlp->pfnPrintf(pHlp, "  ICR Low                       = %#x\n",      pXApicPage->icr_lo.all.u32IcrLo);
     pHlp->pfnPrintf(pHlp, "    Vector                      = %u (%#x)\n", pXApicPage->icr_lo.u.u8Vector,
                                                                           pXApicPage->icr_lo.u.u8Vector);
@@ -1295 +1295 @@
     } while(0)
 
+#define APIC_PROF_COUNTER(a_Reg, a_Desc, a_Key) \
+    do { \
+        rc = STAMR3RegisterF(pVM, a_Reg, STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, a_Desc, a_Key, \
+                             idCpu); \
+        AssertRCReturn(rc, rc); \
+    } while(0)
+
     bool const fHasRC = !HMIsEnabled(pVM);
     for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
@@ -1318 +1325 @@
             APIC_REG_COUNTER(&pApicCpu->StatMsrWriteRC,  "Number of APIC MSR writes in RC.",  "/Devices/APIC/%u/RC/MsrWrite");
         }
+
+        APIC_PROF_COUNTER(&pApicCpu->StatUpdatePendingIntrs, "Profiling of APICUpdatePendingInterrupts",
+                          "/PROF/CPU%d/APIC/UpdatePendingInterrupts");
+        APIC_PROF_COUNTER(&pApicCpu->StatPostInterrupt, "Profiling of APICPostInterrupt", "/PROF/CPU%d/APIC/PostInterrupt");
     }
 # undef APIC_REG_ACCESS_COUNTER

trunk/src/VBox/VMM/include/APICInternal.h

@@ -587 +587 @@
     /** Number of MSR writes in RC. */
     STAMCOUNTER                 StatMsrWriteRC;
+
+    /** Profiling of APICUpdatePendingInterrupts().  */
+    STAMPROFILE                 StatUpdatePendingIntrs;
+    /** Profiling of APICPostInterrupt().  */
+    STAMPROFILE                 StatPostInterrupt;
     /** @} */
 #endif