Changeset 83029 in vbox

Timestamp:

Feb 10, 2020 9:18:24 AM (5 years ago)

Author:

vboxsync

Message:

HM: Always use the 64-bit SVM context switcher for 64-bit capable VMs (see bugref:6208).

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMR0A.asm (modified) (5 diffs)
• HMSVMR0.cpp (modified) (2 diffs)
• HMSVMR0.h (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/HMR0A.asm

@@ -1792 +1792 @@
 
 ;;
-; Prepares for and executes VMRUN (32 bits guests)
+; Prepares for and executes VMRUN (32-bit register context guests)
 ;
 ; @returns  VBox status code
@@ -1802 +1802 @@
 ;
 ALIGNCODE(16)
-BEGINPROC SVMR0VMRun
+BEGINPROC SVMR0VMRun32
 %ifdef RT_ARCH_AMD64 ; fake a cdecl stack frame
  %ifdef ASM_CALL64_GCC
@@ -1936 +1936 @@
 %endif
     ret
-ENDPROC SVMR0VMRun
+ENDPROC SVMR0VMRun32
 
 
 %ifdef RT_ARCH_AMD64
 ;;
-; Prepares for and executes VMRUN (64 bits guests)
+; Prepares for and executes VMRUN (64-bit register context)
 ;
 ; @returns  VBox status code
@@ -1951 +1951 @@
 ;
 ALIGNCODE(16)
-BEGINPROC SVMR0VMRun64
+BEGINPROC SVMR0VMRun
     ; Fake a cdecl stack frame
  %ifdef ASM_CALL64_GCC
@@ -2114 +2114 @@
     add     rsp, 6 * xCB
     ret
-ENDPROC SVMR0VMRun64
+ENDPROC SVMR0VMRun
 %endif ; RT_ARCH_AMD64
 

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

@@ -2180 +2180 @@
  * Selects the appropriate function to run guest code.
  *
- * @returns VBox status code.
  * @param   pVCpu   The cross context virtual CPU structure.
  *
  * @remarks No-long-jump zone!!!
  */
-static int hmR0SvmSelectVMRunHandler(PVMCPUCC pVCpu)
-{
-    if (CPUMIsGuestInLongMode(pVCpu))
-    {
-#ifndef VBOX_WITH_64_BITS_GUESTS
-        return VERR_PGM_UNSUPPORTED_SHADOW_PAGING_MODE;
-#else
+DECLINLINE(void) hmR0SvmSelectVMRunHandler(PVMCPUCC pVCpu)
+{
+    if (pVCpu->CTX_SUFF(pVM)->hm.s.fAllow64BitGuests)
+    {
 # if HC_ARCH_BITS != 64 || ARCH_BITS != 64
 #  error "Only 64-bit hosts are supported!"
 # endif
-        Assert(pVCpu->CTX_SUFF(pVM)->hm.s.fAllow64BitGuests);    /* Guaranteed by hmR3InitFinalizeR0(). */
-        /* Guest in long mode, use 64-bit handler (host is 64-bit). */
-        pVCpu->hm.s.svm.pfnVMRun = SVMR0VMRun64;
-#endif
+        /* Guest may enter long mode, always use 64-bit handler. */
+        pVCpu->hm.s.svm.pfnVMRun = SVMR0VMRun;
     }
     else
     {
-        /* Guest is not in long mode, use the 32-bit handler. */
-        pVCpu->hm.s.svm.pfnVMRun = SVMR0VMRun;
-    }
-    return VINF_SUCCESS;
+        /* Guest is 32-bit only, use the 32-bit handler. */
+        pVCpu->hm.s.svm.pfnVMRun = SVMR0VMRun32;
+    }
 }
 
@@ -2363 +2356 @@
     }
 
-    rc = hmR0SvmSelectVMRunHandler(pVCpu);
-    AssertRCReturn(rc, rc);
+    hmR0SvmSelectVMRunHandler(pVCpu);
 
     /* Clear any bits that may be set but exported unconditionally or unused/reserved bits. */

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

@@ -54 +54 @@
 
 /**
- * Prepares for and executes VMRUN (32-bit guests).
+ * Prepares for and executes VMRUN (32-bit register context).
+ *
+ * @returns VBox status code.
+ * @param   pVMCBHostPhys   Physical address of host VMCB.
+ * @param   pVMCBPhys       Physical address of the VMCB.
+ * @param   pCtx            Pointer to the guest CPU context.
+ * @param   pVM             The cross context VM structure. (Not used.)
+ * @param   pVCpu           The cross context virtual CPU structure. (Not used.)
+ */
+DECLASM(int) SVMR0VMRun32(RTHCPHYS pVMCBHostPhys, RTHCPHYS pVMCBPhys, PCPUMCTX pCtx, PVMCC pVM, PVMCPUCC pVCpu);
+
+
+/**
+ * Prepares for and executes VMRUN (64-bit register context).
  *
  * @returns VBox status code.
@@ -64 +77 @@
  */
 DECLASM(int) SVMR0VMRun(RTHCPHYS pVMCBHostPhys, RTHCPHYS pVMCBPhys, PCPUMCTX pCtx, PVMCC pVM, PVMCPUCC pVCpu);
-
-
-/**
- * Prepares for and executes VMRUN (64-bit guests).
- *
- * @returns VBox status code.
- * @param   pVMCBHostPhys   Physical address of host VMCB.
- * @param   pVMCBPhys       Physical address of the VMCB.
- * @param   pCtx            Pointer to the guest CPU context.
- * @param   pVM             The cross context VM structure. (Not used.)
- * @param   pVCpu           The cross context virtual CPU structure. (Not used.)
- */
-DECLASM(int) SVMR0VMRun64(RTHCPHYS pVMCBHostPhys, RTHCPHYS pVMCBPhys, PCPUMCTX pCtx, PVMCC pVM, PVMCPUCC pVCpu);
 
 /**