Changeset 41931 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jun 27, 2012 4:12:16 PM (13 years ago)

Author:

vboxsync

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

78796

Message:

TRPM: Save state directly to the CPUMCPU context member instead of putting on the stack. this avoid copying the state around before returning to host context to service an IRQ, or before using IEM.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• CPUM.cpp (modified) (3 diffs)
• PDMLdr.cpp (modified) (2 diffs)
• TRPM.cpp (modified) (1 diff)
• VMM.cpp (modified) (2 diffs)
• VMMTests.cpp (modified) (8 diffs)

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

@@ -426 +426 @@
         PVMCPU pVCpu = &pVM->aCpus[i];
 
-        /*
-         * Setup any fixed pointers and offsets.
-         */
-        pVCpu->cpum.s.pHyperCoreR3 = CPUMCTX2CORE(&pVCpu->cpum.s.Hyper);
-        pVCpu->cpum.s.pHyperCoreR0 = VM_R0_ADDR(pVM, CPUMCTX2CORE(&pVCpu->cpum.s.Hyper));
-
-        pVCpu->cpum.s.offCPUM      = RT_OFFSETOF(VM, aCpus[i].cpum) - RT_OFFSETOF(VM, cpum);
+        pVCpu->cpum.s.offCPUM = RT_OFFSETOF(VM, aCpus[i].cpum) - RT_OFFSETOF(VM, cpum);
         Assert((uintptr_t)&pVCpu->cpum - pVCpu->cpum.s.offCPUM == (uintptr_t)&pVM->cpum);
     }
@@ -1269 +1263 @@
 {
     LogFlow(("CPUMR3Relocate\n"));
-    for (VMCPUID i = 0; i < pVM->cCpus; i++)
-    {
-        /*
-         * Switcher pointers.
-         */
-        PVMCPU pVCpu = &pVM->aCpus[i];
-        pVCpu->cpum.s.pHyperCoreRC = MMHyperCCToRC(pVM, pVCpu->cpum.s.pHyperCoreR3);
-        Assert(pVCpu->cpum.s.pHyperCoreRC != NIL_RTRCPTR);
-
-    }
+    /* nothing to do any more. */
 }
 
@@ -2923 +2908 @@
     cpumR3InfoParseArg(pszArgs, &enmType, &pszComment);
     pHlp->pfnPrintf(pHlp, "Hypervisor CPUM state: %s\n", pszComment);
-    cpumR3InfoOne(pVM, &pVCpu->cpum.s.Hyper, pVCpu->cpum.s.pHyperCoreR3, pHlp, enmType, ".");
+    cpumR3InfoOne(pVM, &pVCpu->cpum.s.Hyper, CPUMCTX2CORE(&pVCpu->cpum.s.Hyper), pHlp, enmType, ".");
     pHlp->pfnPrintf(pHlp, "CR4OrMask=%#x CR4AndMask=%#x\n", pVM->cpum.s.CR4.OrMask, pVM->cpum.s.CR4.AndMask);
 }

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

@@ -25 +25 @@
 #include <VBox/vmm/pdm.h>
 #include <VBox/vmm/mm.h>
+#include <VBox/vmm/trpm.h>
 #include <VBox/vmm/vmm.h>
 #include <VBox/vmm/vm.h>
@@ -355 +356 @@
         else if (!strcmp(pszSymbol, "g_CPUM"))
             *pValue = VM_RC_ADDR(pVM, &pVM->cpum);
-        else if (!strcmp(pszSymbol, "g_TRPM"))
-            *pValue = VM_RC_ADDR(pVM, &pVM->trpm);
-        else if (!strcmp(pszSymbol, "g_TRPMCPU"))
-            *pValue = VM_RC_ADDR(pVM, &pVM->aCpus[0].trpm);
+        else if (   !strncmp(pszSymbol, "g_TRPM", 6)
+                 || !strncmp(pszSymbol, "g_trpm", 6)
+                 || !strncmp(pszSymbol, "TRPM", 4))
+        {
+            RTRCPTR RCPtr = 0;
+            rc = TRPMR3GetImportRC(pVM, pszSymbol, &RCPtr);
+            if (RT_SUCCESS(rc))
+                *pValue = RCPtr;
+        }
         else if (   !strncmp(pszSymbol, "VMM", 3)
                  || !strcmp(pszSymbol, "g_Logger")

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

@@ -782 +782 @@
 
 /**
+ * Resolve a builtin RC symbol.
+ *
+ * Called by PDM when loading or relocating RC modules.
+ *
+ * @returns VBox status
+ * @param   pVM             Pointer to the VM.
+ * @param   pszSymbol       Symbol to resolv
+ * @param   pRCPtrValue     Where to store the symbol value.
+ *
+ * @remark  This has to work before VMMR3Relocate() is called.
+ */
+VMMR3_INT_DECL(int) TRPMR3GetImportRC(PVM pVM, const char *pszSymbol, PRTRCPTR pRCPtrValue)
+{
+    if (!strcmp(pszSymbol, "g_TRPM"))
+        *pRCPtrValue = VM_RC_ADDR(pVM, &pVM->trpm);
+    else if (!strcmp(pszSymbol, "g_TRPMCPU"))
+        *pRCPtrValue = VM_RC_ADDR(pVM, &pVM->aCpus[0].trpm);
+    else if (!strcmp(pszSymbol, "g_trpmGuestCtxCore"))
+    {
+        PCPUMCTX pCtx = CPUMQueryGuestCtxPtr(VMMGetCpu0(pVM));
+        *pRCPtrValue = VM_RC_ADDR(pVM, CPUMCTX2CORE(pCtx));
+    }
+    else if (!strcmp(pszSymbol, "g_trpmHyperCtxCore"))
+    {
+        PCPUMCTX pCtx = CPUMGetHyperCtxPtr(VMMGetCpu0(pVM));
+        *pRCPtrValue = VM_RC_ADDR(pVM, CPUMCTX2CORE(pCtx));
+    }
+    else
+        return VERR_SYMBOL_NOT_FOUND;
+    return VINF_SUCCESS;
+}
+
+
+/**
  * Execute state save operation.
  *

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

@@ -561 +561 @@
     if (RT_SUCCESS(rc))
     {
-        CPUMHyperSetCtxCore(pVCpu, NULL);
         CPUMSetHyperESP(pVCpu, pVCpu->vmm.s.pbEMTStackBottomRC); /* Clear the stack. */
         uint64_t u64TS = RTTimeProgramStartNanoTS();
@@ -1874 +1873 @@
      * Setup the call frame using the trampoline.
      */
-    CPUMHyperSetCtxCore(pVCpu, NULL);
     memset(pVCpu->vmm.s.pbEMTStackR3, 0xaa, VMM_STACK_SIZE); /* Clear the stack. */
     CPUMSetHyperESP(pVCpu, pVCpu->vmm.s.pbEMTStackBottomRC - cArgs * sizeof(RTGCUINTPTR32));

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

@@ -61 +61 @@
         return rc;
 
-    CPUMHyperSetCtxCore(pVCpu, NULL);
     memset(pVCpu->vmm.s.pbEMTStackR3, 0xaa, VMM_STACK_SIZE);
     CPUMSetHyperESP(pVCpu, pVCpu->vmm.s.pbEMTStackBottomRC); /* Clear the stack. */
@@ -101 +100 @@
         return rc;
 
-    CPUMHyperSetCtxCore(pVCpu, NULL);
     memset(pVCpu->vmm.s.pbEMTStackR3, 0xaa, VMM_STACK_SIZE);
     CPUMSetHyperESP(pVCpu, pVCpu->vmm.s.pbEMTStackBottomRC); /* Clear the stack. */
@@ -339 +337 @@
          * Interrupt forwarding.
          */
-        CPUMHyperSetCtxCore(pVCpu, NULL);
         CPUMSetHyperESP(pVCpu, pVCpu->vmm.s.pbEMTStackBottomRC); /* Clear the stack. */
         CPUMPushHyper(pVCpu, 0);
@@ -403 +400 @@
         for (i = 0; i < 1000000; i++)
         {
-            CPUMHyperSetCtxCore(pVCpu, NULL);
             CPUMSetHyperESP(pVCpu, pVCpu->vmm.s.pbEMTStackBottomRC); /* Clear the stack. */
             CPUMPushHyper(pVCpu, 0);
@@ -495 +491 @@
     AssertRCReturn(rc, rc);
 
-    CPUMQueryHyperCtxPtr(pVCpu, &pHyperCtx);
+    pHyperCtx = CPUMGetHyperCtxPtr(pVCpu);
 
     pHyperCtx->cr0 = X86_CR0_PE | X86_CR0_WP | X86_CR0_PG | X86_CR0_TS | X86_CR0_ET | X86_CR0_NE | X86_CR0_MP;
@@ -516 +512 @@
         RTPrintf("VMM: VMMGCEntry=%RRv\n", RCPtrEP);
 
-        CPUMQueryHyperCtxPtr(pVCpu, &pHyperCtx);
+        pHyperCtx = CPUMGetHyperCtxPtr(pVCpu);
 
         /* Fill in hidden selector registers for the hypervisor state. */
@@ -537 +533 @@
         for (i = 0; i < 1000000; i++)
         {
-            CPUMHyperSetCtxCore(pVCpu, NULL);
-
             CPUMSetHyperESP(pVCpu, pVCpu->vmm.s.pbEMTStackBottomRC); /* Clear the stack. */
             CPUMPushHyper(pVCpu, 0);
@@ -547 +541 @@
             CPUMSetHyperEIP(pVCpu, pVM->vmm.s.pfnCallTrampolineRC);
 
-            CPUMQueryHyperCtxPtr(pVCpu, &pHyperCtx);
+            pHyperCtx = CPUMGetHyperCtxPtr(pVCpu);
             pGuestCtx = CPUMQueryGuestCtxPtr(pVCpu);