Changeset 5395 in vbox for trunk/src

Timestamp:

Oct 21, 2007 2:19:37 AM (17 years ago)

Author:

vboxsync

Message:

Optimized RDTSC emulation a little bit.

Location:

trunk/src/VBox/VMM

Files:

• TRPM.cpp (modified) (1 diff)
• TRPMInternal.h (modified) (1 diff)
• TRPMInternal.mac (modified) (1 diff)
• VMMGC/TRPMGCHandlers.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/TRPM.cpp

@@ -519 +519 @@
 
     STAM_REG(pVM, &pVM->trpm.s.StatTrap0dDisasm,        STAMTYPE_PROFILE_ADV, "/TRPM/Trap0d/Prof/Disasm",         STAMUNIT_TICKS_PER_CALL, "Profiling trpmGCTrap0dHandler.");
+    STAM_REG(pVM, &pVM->trpm.s.StatTrap0dRing0RdTsc,    STAMTYPE_COUNTER, "/TRPM/Trap0d/RdTsc-R0",                    STAMUNIT_OCCURENCES, "Number of RDTSC #GPs from guest ring-0.");
+    STAM_REG(pVM, &pVM->trpm.s.StatTrap0dRing3RdTsc,    STAMTYPE_COUNTER, "/TRPM/Trap0d/RdTsc-R3",                    STAMUNIT_OCCURENCES, "Number of RDTSC #GPs from guest ring-3.");
 
     /*

trunk/src/VBox/VMM/TRPMInternal.h

@@ -175 +175 @@
     STAMPROFILEADV  StatForwardProfHC;
     STAMPROFILEADV  StatTrap0dDisasm;
+    STAMCOUNTER     StatTrap0dRing0RdTsc;   /**< Number of RDTSC #GPs from guest ring-0. */
+    STAMCOUNTER     StatTrap0dRing3RdTsc;   /**< Number of RDTSC #GPs from guest ring-3. */
 
     /* R3: Statistics for interrupt handlers (allocated on the hypervisor heap). */

trunk/src/VBox/VMM/TRPMInternal.mac

@@ -64 +64 @@
     .StatForwardProfHC        resb STAMPROFILEADV_size
     .StatTrap0dDisasm         resb STAMPROFILEADV_size
+    .StatTrap0dRing0RdTsc     resb STAMCOUNTER_size
+    .StatTrap0dRing3RdTsc     resb STAMCOUNTER_size
 
     .paStatForwardedIRQR3  RTR3PTR_RES 1

trunk/src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp

@@ -525 +525 @@
     switch (pCpu->pCurInstr->opcode)
     {
+        /*
+         * Since we're usually trapping RDTSC there may be a high volume
+         * of these instructions. So, put it first and go straight to
+         * the emulation function to save time.
+         */
+        case OP_RDTSC:
+            STAM_COUNTER_INC(&pVM->trpm.s.StatTrap0dRing0RdTsc);
+            rc = EMInterpretRdtsc(pVM, pRegFrame);
+            if (RT_SUCCESS(rc))
+                pRegFrame->eip += pCpu->opsize;
+            else if (rc == VERR_EM_INTERPRETER)
+                rc = VINF_EM_RAW_EXCEPTION_PRIVILEGED;
+            return trpmGCExitTrap(pVM, rc, pRegFrame);
+
         case OP_INT3:
             /*
@@ -585 +599 @@
         case OP_LLDT:
         case OP_STI:
-        case OP_RDTSC:
         case OP_CLTS:
         {
@@ -622 +635 @@
     switch (pCpu->pCurInstr->opcode)
     {
-        /*
-         * STI and CLI are I/O privileged, i.e. if IOPL
-         */
-        case OP_STI:
-        case OP_CLI:
-        {
-            uint32_t efl = CPUMRawGetEFlags(pVM, pRegFrame);
-            if (X86_EFL_GET_IOPL(efl) >= (unsigned)(pRegFrame->ss & X86_SEL_RPL))
-            {
-                LogFlow(("trpmGCTrap0dHandlerRing3: CLI/STI -> REM\n"));
-                return trpmGCExitTrap(pVM, VINF_EM_RESCHEDULE_REM, pRegFrame);
-            }
-            LogFlow(("trpmGCTrap0dHandlerRing3: CLI/STI -> #GP(0)\n"));
-            break;
-        }
-
         /*
          * INT3 and INT xx are ring-switching.
@@ -679 +676 @@
         /*
          * Handle virtualized TSC reads.
+         * Call the emulation function directly to skip unnecessary overhead.
          */
         case OP_RDTSC:
-        {
-            uint32_t cbIgnored;
-            rc = EMInterpretInstructionCPU(pVM, pCpu, pRegFrame, PC, &cbIgnored);
-            if (VBOX_SUCCESS(rc))
+            STAM_COUNTER_INC(&pVM->trpm.s.StatTrap0dRing3RdTsc);
+            rc = EMInterpretRdtsc(pVM, pRegFrame);
+            if (RT_SUCCESS(rc))
                 pRegFrame->eip += pCpu->opsize;
             else if (rc == VERR_EM_INTERPRETER)
                 rc = VINF_EM_RAW_EXCEPTION_PRIVILEGED;
             return trpmGCExitTrap(pVM, rc, pRegFrame);
+
+        /*
+         * STI and CLI are I/O privileged, i.e. if IOPL
+         */
+        case OP_STI:
+        case OP_CLI:
+        {
+            uint32_t efl = CPUMRawGetEFlags(pVM, pRegFrame);
+            if (X86_EFL_GET_IOPL(efl) >= (unsigned)(pRegFrame->ss & X86_SEL_RPL))
+            {
+                LogFlow(("trpmGCTrap0dHandlerRing3: CLI/STI -> REM\n"));
+                return trpmGCExitTrap(pVM, VINF_EM_RESCHEDULE_REM, pRegFrame);
+            }
+            LogFlow(("trpmGCTrap0dHandlerRing3: CLI/STI -> #GP(0)\n"));
+            break;
         }
     }