Changeset 14845 in vbox for trunk/src/VBox/VMM

Timestamp:

Dec 1, 2008 10:12:25 AM (16 years ago)

Author:

vboxsync

Message:

Switcher updates

Location:

trunk/src/VBox/VMM

Files:

• HWACCM.cpp (modified) (1 diff)
• HWACCMInternal.h (modified) (3 diffs)
• VMMR0/HWACCMR0.cpp (modified) (2 diffs)
• VMMR0/HWVMXR0.cpp (modified) (3 diffs)
• VMMR0/HWVMXR0.h (modified) (3 diffs)
• VMMSwitcher.cpp (modified) (1 diff)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -819 +819 @@
     }
 
+#if RT_ARCH_BITS == 32 && defined(VBOX_ENABLE_64_BITS_GUESTS)
+    if (pVM->fHWACCMEnabled)
+    {
+        switch(PGMGetHostMode(pVM))
+        {
+        case PGMMODE_32_BIT:
+            pVM->hwaccm.s.pfnHost32ToGuest64R0 = VMMR3GetHostToGuestSwitcher(pVM, VMMSWITCHER_32_TO_AMD64);
+            break;
+
+        case PGMMODE_PAE:
+        case PGMMODE_PAE_NX:
+            pVM->hwaccm.s.pfnHost32ToGuest64R0 = VMMR3GetHostToGuestSwitcher(pVM, VMMSWITCHER_PAE_TO_AMD64);
+            break;
+
+        default:
+            AssertFailed();
+            break;
+        }
+
+        rc = PDMR3LdrGetSymbolRC(pVM, NULL,       "VMXGCStartVM64", &pVM->hwaccm.pfnVMXGCStartVM64);
+        AssertMsgRCReturn(rc, ("VMXGCStartVM64 -> rc=%Rrc\n", rc), rc);
+
+        rc = PDMR3LdrGetSymbolRC(pVM, NULL,       "SVMGCVMRun64",   &pVM->hwaccm.pfnSVMGCVMRun64);
+        AssertMsgRCReturn(rc, ("SVMGCVMRun64 -> rc=%Rrc\n", rc), rc);
+    }
+#endif
     return VINF_SUCCESS;
 }

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -200 +200 @@
 
 #if HC_ARCH_BITS == 32
+    /** 32 to 64 bits switcher entrypoint. */
+    RTR0PTR                     pfnHost32ToGuest64R0;
+
+    /* AMD-V 64 bits vmrun handler */
+    RTRCPTR                     pfnSVMGCVMRun64;
+
+    /* VT-x 64 bits vmlaunch handler */
+    RTRCPTR                     pfnVMXGCStartVM64;
+
     uint32_t                    Alignment0;
 #endif
@@ -383 +392 @@
 
         /** Ring 0 handlers for VT-x. */
-        DECLR0CALLBACKMEMBER(int,  pfnStartVM,(RTHCUINT fResume, PCPUMCTX pCtx));
+        DECLR0CALLBACKMEMBER(int,  pfnStartVM,(RTHCUINT fResume, PCPUMCTX pCtx, PVM pVM, PVMCPU pVCpu));
 
         /** Current VMX_VMCS_CTRL_PROC_EXEC_CONTROLS. */
@@ -515 +524 @@
 
 VMMR0DECL(PHWACCM_CPUINFO) HWACCMR0GetCurrentCpu();
+VMMR0DECL(PHWACCM_CPUINFO) HWACCMR0GetCurrentCpuEx(RTCPUID idCpu);
 
 

trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp

@@ -1014 +1014 @@
  *
  * @returns cpu structure pointer
- * @param   pVM         The VM to operate on.
  */
 VMMR0DECL(PHWACCM_CPUINFO) HWACCMR0GetCurrentCpu()
@@ -1020 +1019 @@
     RTCPUID  idCpu = RTMpCpuId();
 
+    return &HWACCMR0Globals.aCpuInfo[idCpu];
+}
+
+/**
+ * Returns the cpu structure for the current cpu.
+ * Keep in mind that there is no guarantee it will stay the same (long jumps to ring 3!!!).
+ *
+ * @returns cpu structure pointer
+ * @param   idCpu       id of the VCPU
+ */
+VMMR0DECL(PHWACCM_CPUINFO) HWACCMR0GetCurrentCpuEx(RTCPUID idCpu)
+{
     return &HWACCMR0Globals.aCpuInfo[idCpu];
 }

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -1502 +1502 @@
     if (pCtx->msrEFER & MSR_K6_EFER_LMA)
     {
-#if !defined(VBOX_WITH_64_BITS_GUESTS) || HC_ARCH_BITS != 64
+#if !defined(VBOX_WITH_64_BITS_GUESTS)
         return VERR_PGM_UNSUPPORTED_SHADOW_PAGING_MODE;
+#elif HC_ARCH_BITS == 32
+        pVCpu->hwaccm.s.vmx.pfnStartVM  = VMXR0SwitcherStartVM64;
 #else
         pVCpu->hwaccm.s.vmx.pfnStartVM  = VMXR0StartVM64;
@@ -2041 +2043 @@
 #endif
     TMNotifyStartOfExecution(pVM);
-    rc = pVCpu->hwaccm.s.vmx.pfnStartVM(pVCpu->hwaccm.s.fResumeVM, pCtx);
+    rc = pVCpu->hwaccm.s.vmx.pfnStartVM(pVCpu->hwaccm.s.fResumeVM, pCtx, pVM, pVCpu);
     TMNotifyEndOfExecution(pVM);
 
@@ -3422 +3424 @@
  * @param   fResume     vmlauch/vmresume
  * @param   pCtx        Guest context
+ * @param   pVM         The VM to operate on.
+ * @param   pVCpu       The VMCPU to operate on.
  */
-DECLASM(int) VMXR0SwitcherStartVM64(RTHCUINT fResume, PCPUMCTX pCtx)
+DECLASM(int) VMXR0SwitcherStartVM64(RTHCUINT fResume, PCPUMCTX pCtx, PVM pVM, PVMCPU pVCpu)
 {
-    return VERR_NOT_IMPLEMENTED;
+    int             rc, rc2;
+    RTCCUINTREG     uFlags;
+    PHWACCM_CPUINFO pCpu;
+    RTHCPHYS        pPageCpuPhys;
+
+    pCpu = HWACCMR0GetCurrentCpuEx(pVCpu->idCpu);
+    pPageCpuPhys = RTR0MemObjGetPagePhysAddr(pCpu->pMemObj, 0);
+
+    /* Clear VM Control Structure. Marking it inactive, clearing implementation specific data and writing back VMCS data to memory. */
+    VMXClearVMCS(pVCpu->hwaccm.s.vmx.pVMCSPhys);
+
+    /* Leave VMX Root Mode. */
+    VMXDisable();
+
+    uFlags = ASMIntDisableFlags();
+    /* Call switcher. */
+    rc = VERR_ACCESS_DENIED;
+
+    ASMSetFlags(uFlags);
+
+    /* Make sure the VMX instructions don't cause #UD faults. */
+    ASMSetCR4(ASMGetCR4() | X86_CR4_VMXE);
+
+    /* Enter VMX Root Mode */
+    rc2 = VMXEnable(pPageCpuPhys);
+    if (RT_FAILURE(rc2))
+    {
+        if (pVM)
+            VMXR0CheckError(pVM, pVCpu, rc2);
+        ASMSetCR4(ASMGetCR4() & ~X86_CR4_VMXE);
+        return VERR_VMX_VMXON_FAILED;
+    }
+
+    VMXActivateVMCS(pVCpu->hwaccm.s.vmx.pVMCSPhys);
+    return rc;
 }
 #endif

trunk/src/VBox/VMM/VMMR0/HWVMXR0.h

@@ -196 +196 @@
  * @param   fResume     vmlauch/vmresume
  * @param   pCtx        Guest context
- */
-DECLASM(int) VMXR0StartVM32(RTHCUINT fResume, PCPUMCTX pCtx);
+ * @param   pVM         The VM to operate on.
+ * @param   pVCpu       The VMCPU to operate on.
+ */
+DECLASM(int) VMXR0StartVM32(RTHCUINT fResume, PCPUMCTX pCtx, PVM pVM, PVMCPU pVCpu);
 
 /**
@@ -205 +207 @@
  * @param   fResume     vmlauch/vmresume
  * @param   pCtx        Guest context
- */
-DECLASM(int) VMXR0StartVM64(RTHCUINT fResume, PCPUMCTX pCtx);
+ * @param   pVM         The VM to operate on.
+ * @param   pVCpu       The VMCPU to operate on.
+ */
+DECLASM(int) VMXR0StartVM64(RTHCUINT fResume, PCPUMCTX pCtx, PVM pVM, PVMCPU pVCpu);
 
 /**
@@ -214 +218 @@
  * @param   fResume     vmlauch/vmresume
  * @param   pCtx        Guest context
- */
-DECLASM(int) VMXR0SwitcherStartVM64(RTHCUINT fResume, PCPUMCTX pCtx);
+ * @param   pVM         The VM to operate on.
+ * @param   pVCpu       The VMCPU to operate on.
+ */
+DECLASM(int) VMXR0SwitcherStartVM64(RTHCUINT fResume, PCPUMCTX pCtx, PVM pVM, PVMCPU pVCpu);
 
 #endif /* IN_RING0 */

trunk/src/VBox/VMM/VMMSwitcher.cpp

@@ -982 +982 @@
 }
 
+/**
+ * Gets the switcher to be used for switching to GC.
+ *
+ * @returns host to guest ring 0 switcher entrypoint
+ * @param   pVM             VM handle.
+ * @param   enmSwitcher     The new switcher.
+ */
+VMMR3DECL(RTR0PTR) VMMR3GetHostToGuestSwitcher(PVM pVM, VMMSWITCHER enmSwitcher)
+{
+    /*
+     * Validate input.
+     */
+    if (    enmSwitcher < VMMSWITCHER_INVALID
+        ||  enmSwitcher >= VMMSWITCHER_MAX)
+    {
+        AssertMsgFailed(("Invalid input enmSwitcher=%d\n", enmSwitcher));
+        return VERR_INVALID_PARAMETER;
+    }
+
+    /*
+     * Select the new switcher.
+     */
+    PVMMSWITCHERDEF pSwitcher = s_apSwitchers[enmSwitcher];
+    if (pSwitcher)
+    {
+        RTR0PTR     pbCodeR0 = (RTR0PTR)pVM->vmm.s.pvCoreCodeR0 + pVM->vmm.s.aoffSwitchers[enmSwitcher]; /** @todo fix the pvCoreCodeR0 type */
+        return pbCodeR0 + pSwitcher->offR0HostToGuest;
+    }
+    return (RTR0PTR)0;
+}