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

Timestamp:

Jun 14, 2010 2:13:50 PM (15 years ago)

Author:

vboxsync

Message:

Make 32->64 switcher SMP aware.

Location:

trunk/src/VBox/VMM

Files:

• CPUMInternal.mac (modified) (1 diff)
• HWACCMInternal.h (modified) (1 diff)
• VMMR0/HWSVMR0.cpp (modified) (1 diff)
• VMMR0/HWVMXR0.cpp (modified) (1 diff)
• VMMSwitcher/LegacyandAMD64.mac (modified) (11 diffs)

trunk/src/VBox/VMM/CPUMInternal.mac

@@ -436 +436 @@
 
 ;;
-; Converts the CPUMCPU pointer to CPUM (for the first VMCPU)
+; Converts the CPUM pointer to CPUMCPU
+; @param   %1   register name (PVM)
+; @param   %2   register name (CPUMCPU offset)
+%macro CPUMCPU_FROM_CPUM_WITH_OFFSET 2
+    add     %1, %2
+%endmacro
+
+;;
+; Converts the CPUMCPU pointer to CPUM
 ; @param   %1   register name
 %macro CPUM_FROM_CPUMCPU 1

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -231 +231 @@
  * Switcher function, HC to RC.
  *
- * @param   pVM         The VM handle.
+ * @param   pVM             The VM handle.
+ * @param   uOffsetVMCPU    VMCPU offset from pVM
  * @returns Return code indicating the action to take.
  */
-typedef DECLASMTYPE(int) FNHWACCMSWITCHERHC(PVM pVM);
+typedef VMMDECL(int) FNHWACCMSWITCHERHC(PVM pVM, uint32_t uOffsetVMCPU);
 /** Pointer to switcher function. */
 typedef FNHWACCMSWITCHERHC *PFNHWACCMSWITCHERHC;

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

@@ -2874 +2874 @@
     STAM_PROFILE_ADV_START(&pVCpu->hwaccm.s.StatWorldSwitch3264, z);
     /* Call switcher. */
-    rc = pVM->hwaccm.s.pfnHost32ToGuest64R0(pVM);
+    rc = pVM->hwaccm.s.pfnHost32ToGuest64R0(pVM, RT_OFFSETOF(VM, aCpus[pVCpu->idCpu].cpum) - RT_OFFSETOF(VM, cpum));
     STAM_PROFILE_ADV_STOP(&pVCpu->hwaccm.s.StatWorldSwitch3264, z);
 

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

@@ -4619 +4619 @@
     STAM_PROFILE_ADV_START(&pVCpu->hwaccm.s.StatWorldSwitch3264, z);
     /* Call switcher. */
-    rc = pVM->hwaccm.s.pfnHost32ToGuest64R0(pVM);
+    rc = pVM->hwaccm.s.pfnHost32ToGuest64R0(pVM, RT_OFFSETOF(VM, aCpus[pVCpu->idCpu].cpum) - RT_OFFSETOF(VM, cpum));
     STAM_PROFILE_ADV_STOP(&pVCpu->hwaccm.s.StatWorldSwitch3264, z);
 

trunk/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac

@@ -52 +52 @@
 ;;
 ; The C interface.
+; @param    [esp + 04h]  Param 1 - VM handle
+; @param    [esp + 08h]  Param 2 - VMCPU offset
 ;
 BEGINPROC vmmR0HostToGuest
@@ -68 +70 @@
  %endif
 
+    push    ebp
+    mov     ebp, [esp + 12]             ; VMCPU offset
+
     ; turn off interrupts
     pushf
@@ -82 +87 @@
     ; restore original flags
     popf
+    pop     ebp
 
 %ifdef VBOX_WITH_STATISTICS
@@ -103 +109 @@
 ; INPUT:
 ;       - edx       virtual address of CPUM structure (valid in host context)
+;       - ebp       offset of the CPUMCPU structure
 ;
 ; USES/DESTROYS:
@@ -117 +124 @@
     ;;      Skip eax, edx and ecx as these are not preserved over calls.
     ;;
-    CPUMCPU_FROM_CPUM(edx)
+    CPUMCPU_FROM_CPUM_WITH_OFFSET edx, ebp
 %ifdef VBOX_WITH_CRASHDUMP_MAGIC
     ; phys address of scratch page
@@ -224 +231 @@
 
     ; 4. Enable long mode.
-    mov     ebp, edx
+    mov     esi, edx
     mov     ecx, MSR_K6_EFER
     rdmsr
@@ -231 +238 @@
     and     eax, ~(MSR_K6_EFER_FFXSR) ; turn off fast fxsave/fxrstor (skipping xmm regs)
     wrmsr
-    mov     edx, ebp
+    mov     edx, esi
     DEBUG_CHAR('4')
 
@@ -280 +287 @@
     ; Load CPUM pointer into rdx
     mov     rdx, [NAME(pCpumIC) wrt rip]
-    CPUMCPU_FROM_CPUM(edx)
+    CPUMCPU_FROM_CPUM_WITH_OFFSET    edx, ebp
 
     mov     rax, cs
@@ -362 +369 @@
     ; Load CPUM pointer into rdx
     mov     rdx, [NAME(pCpumIC) wrt rip]
-    CPUMCPU_FROM_CPUM(edx)
+    CPUMCPU_FROM_CPUM_WITH_OFFSET    edx, ebp
 
 %ifdef VBOX_WITH_CRASHDUMP_MAGIC
@@ -507 +514 @@
     mov     es, eax
 
-    FIXUP FIX_GC_CPUMCPU_OFF, 1, 0
+    FIXUP FIX_GC_CPUM_OFF, 1, 0
     mov     edx, 0ffffffffh
+    CPUMCPU_FROM_CPUM_WITH_OFFSET    edx, ebp
     mov     esi, [edx + CPUMCPU.Host.cr3]
     mov     cr3, esi
@@ -515 +523 @@
     FIXUP FIX_HC_CPUM_OFF, 1, 0
     mov     edx, 0ffffffffh
-    CPUMCPU_FROM_CPUM(edx)
+    CPUMCPU_FROM_CPUM_WITH_OFFSET    edx, ebp
 
     ; restore the host EFER