Changeset 82378 in vbox for trunk/src/VBox/VMM/VMMAll/IOMAll.cpp

Timestamp:

Dec 4, 2019 12:13:45 PM (5 years ago)

Author:

vboxsync

Message:

IOM: Better I/O port statistics. bugref:9218

File:

• trunk/src/VBox/VMM/VMMAll/IOMAll.cpp (modified) (8 diffs)

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

@@ -57 +57 @@
 VMMDECL(VBOXSTRICTRC) IOMIOPortRead(PVMCC pVM, PVMCPU pVCpu, RTIOPORT Port, uint32_t *pu32Value, size_t cbValue)
 {
+    STAM_COUNTER_INC(&pVM->iom.s.StatIoPortIn);
     Assert(pVCpu->iom.s.PendingIOPortWrite.cbValue == 0);
 
@@ -115 +116 @@
             PDMCritSectLeave(pDevIns->CTX_SUFF(pCritSectRo));
 
-            if (rcStrict == VINF_SUCCESS)
+#ifndef IN_RING3
+            if (rcStrict == VINF_IOM_R3_IOPORT_READ)
+                STAM_COUNTER_INC(&pStats->InRZToR3);
+            else
+#endif
+            {
                 STAM_COUNTER_INC(&pStats->CTX_SUFF_Z(In));
-#ifndef IN_RING3
-            else if (rcStrict == VINF_IOM_R3_IOPORT_READ)
-                STAM_COUNTER_INC(&pStats->InRZToR3);
-#endif
-            else if (rcStrict == VERR_IOM_IOPORT_UNUSED)
-            {
-                /* make return value */
-                rcStrict = VINF_SUCCESS;
-                switch (cbValue)
+                STAM_COUNTER_INC(&iomIoPortGetStats(pVM, pRegEntry, 0)->Total);
+                if (rcStrict == VERR_IOM_IOPORT_UNUSED)
                 {
-                    case 1: *(uint8_t  *)pu32Value = 0xff; break;
-                    case 2: *(uint16_t *)pu32Value = 0xffff; break;
-                    case 4: *(uint32_t *)pu32Value = UINT32_C(0xffffffff); break;
-                    default:
-                        AssertMsgFailedReturn(("Invalid I/O port size %d. Port=%d\n", cbValue, Port), VERR_IOM_INVALID_IOPORT_SIZE);
+                    /* make return value */
+                    rcStrict = VINF_SUCCESS;
+                    switch (cbValue)
+                    {
+                        case 1: *(uint8_t  *)pu32Value = 0xff; break;
+                        case 2: *(uint16_t *)pu32Value = 0xffff; break;
+                        case 4: *(uint32_t *)pu32Value = UINT32_C(0xffffffff); break;
+                        default:
+                            AssertMsgFailedReturn(("Invalid I/O port size %d. Port=%d\n", cbValue, Port), VERR_IOM_INVALID_IOPORT_SIZE);
+                    }
                 }
-            }
+           }
             Log3(("IOMIOPortRead: Port=%RTiop *pu32=%08RX32 cb=%d rc=%Rrc\n", Port, *pu32Value, cbValue, VBOXSTRICTRC_VAL(rcStrict)));
+            STAM_COUNTER_INC(&iomIoPortGetStats(pVM, pRegEntry, 0)->Total);
         }
         else
@@ -179 +184 @@
                                                void *pvDst, uint32_t *pcTransfers, unsigned cb)
 {
+    STAM_COUNTER_INC(&pVM->iom.s.StatIoPortInS);
     Assert(pVCpu->iom.s.PendingIOPortWrite.cbValue == 0);
 
@@ -279 +285 @@
 
 #ifdef VBOX_WITH_STATISTICS
-            if (rcStrict == VINF_SUCCESS && pStats)
+# ifndef IN_RING3
+            if (rcStrict == VINF_IOM_R3_IOPORT_READ)
+                STAM_COUNTER_INC(&pStats->InRZToR3);
+            else
+# endif
+            {
                 STAM_COUNTER_INC(&pStats->CTX_SUFF_Z(In));
-# ifndef IN_RING3
-            else if (rcStrict == VINF_IOM_R3_IOPORT_READ && pStats)
-                STAM_COUNTER_INC(&pStats->InRZToR3);
-# endif
+                STAM_COUNTER_INC(&iomIoPortGetStats(pVM, pRegEntry, 0)->Total);
+            }
 #endif
             Log3(("IOMIOPortReadStr: uPort=%RTiop pvDst=%p pcTransfer=%p:{%#x->%#x} cb=%d rc=%Rrc\n",
@@ -349 +358 @@
 VMMDECL(VBOXSTRICTRC) IOMIOPortWrite(PVMCC pVM, PVMCPU pVCpu, RTIOPORT Port, uint32_t u32Value, size_t cbValue)
 {
+    STAM_COUNTER_INC(&pVM->iom.s.StatIoPortOut);
 #ifndef IN_RING3
     Assert(pVCpu->iom.s.PendingIOPortWrite.cbValue == 0);
@@ -408 +418 @@
 
 #ifdef VBOX_WITH_STATISTICS
-            if (rcStrict == VINF_SUCCESS)
+# ifndef IN_RING3
+            if (rcStrict != VINF_IOM_R3_IOPORT_WRITE)
+# endif
+            {
                 STAM_COUNTER_INC(&pStats->CTX_SUFF_Z(Out));
+                STAM_COUNTER_INC(&iomIoPortGetStats(pVM, pRegEntry, 0)->Total);
+            }
 #endif
             Log3(("IOMIOPortWrite: Port=%RTiop u32=%08RX32 cb=%d rc=%Rrc\n", Port, u32Value, cbValue, VBOXSTRICTRC_VAL(rcStrict)));
@@ -454 +469 @@
                                                 uint32_t *pcTransfers, unsigned cb)
 {
+    STAM_COUNTER_INC(&pVM->iom.s.StatIoPortOutS);
     Assert(pVCpu->iom.s.PendingIOPortWrite.cbValue == 0);
     Assert(cb == 1 || cb == 2 || cb == 4);
@@ -549 +565 @@
 
 #ifdef VBOX_WITH_STATISTICS
-            if (rcStrict == VINF_SUCCESS)
+# ifndef IN_RING3
+            if (rcStrict == VINF_IOM_R3_IOPORT_WRITE)
+                STAM_COUNTER_INC(&pStats->OutRZToR3);
+            else
+# endif
+            {
                 STAM_COUNTER_INC(&pStats->CTX_SUFF_Z(Out));
-# ifndef IN_RING3
-            else if (rcStrict == VINF_IOM_R3_IOPORT_WRITE)
-                STAM_COUNTER_INC(&pStats->OutRZToR3);
-# endif
+                STAM_COUNTER_INC(&iomIoPortGetStats(pVM, pRegEntry, 0)->Total);
+            }
 #endif
             Log3(("IOMIOPortWriteStr: uPort=%RTiop pvSrc=%p pcTransfer=%p:{%#x->%#x} cb=%d rcStrict=%Rrc\n",