Changeset 1210 in vbox

Timestamp:

Mar 5, 2007 12:36:53 PM (18 years ago)

Author:

vboxsync

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

19136

Message:

Added PGMR3ChangeShwPDMappings.
Added VMX/SVM test case.

Location:

trunk/src/VBox/VMM

Files:

• HWACCM.cpp (modified) (1 diff)
• PGM.cpp (modified) (2 diffs)
• VMM.cpp (modified) (2 diffs)
• VMMGC/VMMGC.cpp (modified) (1 diff)
• VMMInternal.h (modified) (1 diff)
• testcase/Makefile (modified) (2 diffs)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -251 +251 @@
 
     /* Disable mapping of the hypervisor into the shadow page table. */
-    PGMR3RemoveMappingsFromShwPD(pVM);
+    PGMR3ChangeShwPDMappings(pVM, false);
+
+    /* Disable the switcher */
+    VMMR3DisableSwitcher(pVM);
 }
 

trunk/src/VBox/VMM/PGM.cpp

@@ -3384 +3384 @@
 
 /**
- * Inform PGM we don't wish any mapping to be put into the shadow page table. (necessary for e.g. VMX)
+ * Inform PGM if we want all mappings to be put into the shadow page table. (necessary for e.g. VMX)
  *
  * @returns VBox status code.
  * @param   pVM         VM handle.
- */
-PGMR3DECL(int) PGMR3RemoveMappingsFromShwPD(PVM pVM)
-{
-
-    pVM->pgm.s.fDisableMappings = true;
+ * @param   fEnable     Enable or disable shadow mappings
+ */
+PGMR3DECL(int) PGMR3ChangeShwPDMappings(PVM pVM, bool fEnable)
+{
+    pVM->pgm.s.fDisableMappings = fEnable;
 
     size_t cb;
@@ -3402 +3402 @@
     AssertRCReturn(rc, rc);
 
-    VMMR3DisableSwitcher(pVM);
     return VINF_SUCCESS;
 }

trunk/src/VBox/VMM/VMM.cpp

@@ -149 +149 @@
 #include <VBox/version.h>
 #include <VBox/x86.h>
+#include <VBox/hwaccm.h>
 #include <iprt/assert.h>
 #include <iprt/alloc.h>
@@ -2913 +2914 @@
 }
 
+/* execute the switch. */
+VMMR3DECL(int) VMMDoHwAccmTest(PVM pVM)
+{
+    uint32_t i;
+
+    if (!HWACCMR3IsAllowed(pVM))
+    {
+        RTPrintf("VMM: Hardware accelerated test now available!\n");
+        return VERR_ACCESS_DENIED;
+    }
+
+    /*
+     * These forced actions are not necessary for the test and trigger breakpoints too.
+     */
+    VM_FF_CLEAR(pVM, VM_FF_TRPM_SYNC_IDT);
+    VM_FF_CLEAR(pVM, VM_FF_SELM_SYNC_TSS);
+
+    /* Enable mapping of the hypervisor into the shadow page table. */
+    PGMR3ChangeShwPDMappings(pVM, true);
+
+    /*
+     * Setup stack for calling VMMGCEntry().
+     */
+    RTGCPTR GCPtrEP;
+    int rc = PDMR3GetSymbolGC(pVM, VMMGC_MAIN_MODULE_NAME, "VMMGCEntry", &GCPtrEP);
+    if (VBOX_SUCCESS(rc))
+    {
+        RTPrintf("VMM: VMMGCEntry=%VGv\n", GCPtrEP);
+        /*
+         * Profile switching.
+         */
+        RTPrintf("VMM: profiling switcher...\n");
+        Log(("VMM: profiling switcher...\n"));
+        uint64_t TickMin = ~0;
+        uint64_t tsBegin = RTTimeNanoTS();
+        uint64_t TickStart = ASMReadTSC();
+        for (i = 0; i < 1000000; i++)
+        {
+            CPUMHyperSetCtxCore(pVM, NULL);
+            CPUMSetHyperESP(pVM, pVM->vmm.s.pbGCStackBottom); /* Clear the stack. */
+            CPUMPushHyper(pVM, 0);
+            CPUMPushHyper(pVM, VMMGC_DO_TESTCASE_HWACCM_NOP);
+            CPUMPushHyper(pVM, pVM->pVMGC);
+            CPUMPushHyper(pVM, 3 * sizeof(RTGCPTR));    /* stack frame size */
+            CPUMPushHyper(pVM, GCPtrEP);                /* what to call */
+            CPUMSetHyperEIP(pVM, pVM->vmm.s.pfnGCCallTrampoline);
+
+            PCPUMCTX pHyperCtx, pGuestCtx;
+            
+            CPUMQueryHyperCtxPtr(pVM, &pHyperCtx);
+            CPUMQueryGuestCtxPtr(pVM, &pGuestCtx);
+
+            /* Copy the hypervisor context to make sure we have a valid guest context. */
+            *pGuestCtx = *pHyperCtx;
+
+            uint64_t TickThisStart = ASMReadTSC();
+            rc = SUPCallVMMR0(pVM->pVMR0, VMMR0_DO_HWACC_RUN, NULL);
+            uint64_t TickThisElapsed = ASMReadTSC() - TickThisStart;
+            if (VBOX_FAILURE(rc))
+            {
+                Log(("VMM: GC returned fatal %Vra in iteration %d\n", rc, i));
+                VMMR3FatalDump(pVM, rc);
+                return rc;
+            }
+            if (TickThisElapsed < TickMin)
+                TickMin = TickThisElapsed;
+        }
+        uint64_t TickEnd = ASMReadTSC();
+        uint64_t tsEnd = RTTimeNanoTS();
+
+        uint64_t Elapsed = tsEnd - tsBegin;
+        uint64_t PerIteration = Elapsed / (uint64_t)i;
+        uint64_t cTicksElapsed = TickEnd - TickStart;
+        uint64_t cTicksPerIteration = cTicksElapsed / (uint64_t)i;
+
+        RTPrintf("VMM: %8d cycles     in %11llu ns (%11lld ticks),  %10llu ns/iteration (%11lld ticks)  Min %11lld ticks\n",
+                 i, Elapsed, cTicksElapsed, PerIteration, cTicksPerIteration, TickMin);
+        Log(("VMM: %8d cycles     in %11llu ns (%11lld ticks),  %10llu ns/iteration (%11lld ticks)  Min %11lld ticks\n",
+             i, Elapsed, cTicksElapsed, PerIteration, cTicksPerIteration, TickMin));
+
+        rc = VINF_SUCCESS;
+    }
+    else
+        AssertMsgFailed(("Failed to resolved VMMGC.gc::VMMGCEntry(), rc=%Vrc\n", rc));
+
+    return rc;
+}

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

@@ -98 +98 @@
 
         /*
+         * Testcase executes a privileged instruction to force a world switch. (in both SVM & VMX)
+         */
+        case VMMGC_DO_TESTCASE_HWACCM_NOP:
+            ASMRdMsr_Low(MSR_IA32_SYSENTER_CS);
+            return 0;
+
+        /*
          * Delay for ~100us.
          */

trunk/src/VBox/VMM/VMMInternal.h

@@ -360 +360 @@
     /** Testcase for checking interrupt masking.. */
     VMMGC_DO_TESTCASE_INTERRUPT_MASKING,
+    /** Switching testing and profiling stub. */
+    VMMGC_DO_TESTCASE_HWACCM_NOP,
 
     /** The usual 32-bit hack. */

trunk/src/VBox/VMM/testcase/Makefile

@@ -31 +31 @@
 PROGRAMS        += tstAsmStructs tstAsmStructsGC
 endif
-PROGRAMS        += tstVMM
+PROGRAMS        += tstVMM tstVMM-HwAccm
 ifdef VBOX_WITH_TESTCASES
 PROGRAMS        += tstCFGM tstSSM tstMMHyperHeap tstVMM-2 tstVMREQ tstMicro tstCompiler tstVMMR0CallHost-1
@@ -120 +120 @@
 tstVMM_TEMPLATE         = VBOXR3EXE
 tstVMM_LIBS             = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
+
+tstVMM-HwAccm_SOURCES   = tstVMM-HwAccm.cpp
+tstVMM-HwAccm_TEMPLATE  = VBOXR3EXE
+tstVMM-HwAccm_LIBS      = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
 
 tstVMM-2_SOURCES        = tstVMM-2.cpp