Changeset 9457 in vbox for trunk/src/VBox

Timestamp:

Jun 6, 2008 9:46:39 AM (17 years ago)

Author:

vboxsync

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

31712

Message:

Reapplied fixed 31707.

Location:

trunk/src/VBox/VMM

Files:

• HWACCMInternal.h (modified) (1 diff)
• VMMR0/HWACCMR0A.asm (modified) (6 diffs)
• VMMR0/HWSVMR0.cpp (modified) (2 diffs)
• VMMR0/HWVMXR0.cpp (modified) (3 diffs)
• VMMR0/HWVMXR0.h (modified) (1 diff)

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -194 +194 @@
         /** Virtual address of the TSS page used for real mode emulation. */
         R0PTRTYPE(PVBOXTSS)         pRealModeTSS;
+
+        /** Ring 0 handlers for VT-x. */
+        DECLR0CALLBACKMEMBER(int, pfnStartVM,(RTHCUINT fResume, PCPUMCTX pCtx));
 
         /** Host CR4 value (set by ring-0 VMX init) */

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

@@ -178 +178 @@
 
 ;/**
-; * Prepares for and executes VMLAUNCH
-; *
-; * @note identical to VMXResumeVM, except for the vmlaunch/vmresume opcode
-; *
-; * @returns VBox status code
-; * @param   pCtx        Guest context
-; */
-BEGINPROC VMXStartVM
+; * Prepares for and executes VMLAUNCH/VMRESUME (32 bits guest mode)
+; *
+; * @returns VBox status code
+; * @param   fResume    vmlauch/vmresume
+; * @param   pCtx       Guest context
+; */
+BEGINPROC VMXR0StartVM32
     push    xBP
     mov     xBP, xSP
@@ -201 +200 @@
     mov     eax, VMX_VMCS_HOST_RIP  ;/* return address (too difficult to continue after VMLAUNCH?) */
     vmwrite xAX, [xSP]
-    ;/* @todo assumes success... */
+    ;/* Note: assumes success... */
     add     xSP, xS
 
@@ -219 +218 @@
     MYPUSHAD
 
+    ;/* Save the Guest CPU context pointer. */
+%ifdef RT_ARCH_AMD64
+ %ifdef ASM_CALL64_GCC
+    ; fResume already in rdi
+    ; pCtx    already in rsi
+ %else
+    mov     rdi, rcx        ; fResume
+    mov     rsi, rdx        ; pCtx
+ %endif
+%else
+    mov     edi, [ebp + 8]  ; fResume
+    mov     esi, [ebp + 12] ; pCtx
+%endif
+
     ;/* Save segment registers */
+    ; Note: MYPUSHSEGS trashes rdx (among others), so we moved it here (msvc amd64 case)
     MYPUSHSEGS xAX, ax
 
-    ;/* Save the Guest CPU context pointer. */
-%ifdef RT_ARCH_AMD64
- %ifdef ASM_CALL64_GCC
-    mov     rsi, rdi ; pCtx
- %else
-    mov     rsi, rcx ; pCtx
- %endif
-%else
-    mov     esi, [ebp + 8] ; pCtx
-%endif
+    ; Save the pCtx pointer
     push    xSI
 
@@ -258 +263 @@
     mov     eax, VMX_VMCS_HOST_RSP
     vmwrite xAX, xSP
-    ;/* @todo assumes success... */
+    ;/* Note: assumes success... */
     ;/* Don't mess with ESP anymore!! */
 
@@ -266 +271 @@
     mov     ecx, [xSI + CPUMCTX.ecx]
     mov     edx, [xSI + CPUMCTX.edx]
+    mov     ebp, [xSI + CPUMCTX.ebp]
+
+    ; resume or start?
+    cmp     xDI, 0                  ; fResume
+    je      .vmlauch_lauch
+
+    ;/* Restore edi & esi. */
     mov     edi, [xSI + CPUMCTX.edi]
-    mov     ebp, [xSI + CPUMCTX.ebp]
+    mov     esi, [xSI + CPUMCTX.esi]
+
+    vmresume
+    jmp     .vmlaunch_done;      ;/* here if vmresume detected a failure. */
+    
+.vmlauch_lauch:    
+    ;/* Restore edi & esi. */
+    mov     edi, [xSI + CPUMCTX.edi]
     mov     esi, [xSI + CPUMCTX.esi]
 
@@ -365 +384 @@
     jmp     .vmstart_end
 
-ENDPROC VMXStartVM
-
-
-;/**
-; * Prepares for and executes VMRESUME
-; *
-; * @note identical to VMXStartVM, except for the vmlaunch/vmresume opcode
-; *
-; * @returns VBox status code
-; * @param   pCtx        Guest context
-; */
-BEGINPROC VMXResumeVM
-    push    xBP
-    mov     xBP, xSP
-
-    pushf
-    cli
-
-    ;/* First we have to save some final CPU context registers. */
-%ifdef RT_ARCH_AMD64
-    mov     rax, qword .vmresume_done
-    push    rax
-%else
-    push    .vmresume_done
-%endif
-    mov     eax, VMX_VMCS_HOST_RIP  ;/* return address (too difficult to continue after VMLAUNCH?) */
-    vmwrite xAX, [xSP]
-    ;/* @todo assumes success... */
-    add     xSP, xS
-
-    ;/* Manual save and restore:
-    ; * - General purpose registers except RIP, RSP
-    ; *
-    ; * Trashed:
-    ; * - CR2 (we don't care)
-    ; * - LDTR (reset to 0)
-    ; * - DRx (presumably not changed at all)
-    ; * - DR7 (reset to 0x400)
-    ; * - EFLAGS (reset to RT_BIT(1); not relevant)
-    ; *
-    ; */
-
-    ;/* Save all general purpose host registers. */
-    MYPUSHAD
-
-    ;/* Save segment registers */
-    MYPUSHSEGS xAX, ax
-
-    ;/* Save the Guest CPU context pointer. */
-%ifdef RT_ARCH_AMD64
- %ifdef ASM_CALL64_GCC
-    mov     rsi, rdi        ; pCtx
- %else
-    mov     rsi, rcx        ; pCtx
- %endif
-%else
-    mov     esi, [ebp + 8]  ; pCtx
-%endif
-    push    xSI
-
-    ; Save LDTR
-    xor     eax, eax
-    sldt    ax
-    push    xAX
-
-    ; VMX only saves the base of the GDTR & IDTR and resets the limit to 0xffff; we must restore the limit correctly!
-    sub     xSP, xS*2
-    sgdt    [xSP]
-
-    sub     xSP, xS*2
-    sidt    [xSP]
-
-%ifdef VBOX_WITH_DR6_EXPERIMENT
-    ; Restore DR6 - experiment, not safe!
-    mov     xBX, [xSI + CPUMCTX.dr6]
-    mov     dr6, xBX
-%endif
-
-    ; Restore CR2
-    mov     xBX, [xSI + CPUMCTX.cr2]
-    mov     cr2, xBX
-
-    mov     eax, VMX_VMCS_HOST_RSP
-    vmwrite xAX, xSP
-    ;/* @todo assumes success... */
-    ;/* Don't mess with ESP anymore!! */
-
-    ;/* Restore Guest's general purpose registers. */
-    mov     eax, [xSI + CPUMCTX.eax]
-    mov     ebx, [xSI + CPUMCTX.ebx]
-    mov     ecx, [xSI + CPUMCTX.ecx]
-    mov     edx, [xSI + CPUMCTX.edx]
-    mov     edi, [xSI + CPUMCTX.edi]
-    mov     ebp, [xSI + CPUMCTX.ebp]
-    mov     esi, [xSI + CPUMCTX.esi]
-
-    vmresume
-    jmp     .vmresume_done;      ;/* here if vmresume detected a failure. */
-
-ALIGNCODE(16)
-.vmresume_done:
-    jc      near .vmxresume_invalid_vmxon_ptr
-    jz      near .vmxresume_start_failed
-
-    ; Restore base and limit of the IDTR & GDTR
-    lidt    [xSP]
-    add     xSP, xS*2
-    lgdt    [xSP]
-    add     xSP, xS*2
-
-    push    xDI
-    mov     xDI, [xSP + xS * 2]         ; pCtx
-
-    mov     [ss:xDI + CPUMCTX.eax], eax
-    mov     [ss:xDI + CPUMCTX.ebx], ebx
-    mov     [ss:xDI + CPUMCTX.ecx], ecx
-    mov     [ss:xDI + CPUMCTX.edx], edx
-    mov     [ss:xDI + CPUMCTX.esi], esi
-    mov     [ss:xDI + CPUMCTX.ebp], ebp
-%ifdef RT_ARCH_AMD64
-    pop     xAX                                 ; the guest edi we pushed above
-    mov     dword [ss:xDI + CPUMCTX.edi], eax
-%else
-    pop     dword [ss:xDI + CPUMCTX.edi]        ; the guest edi we pushed above
-%endif
-
-%ifdef VBOX_WITH_DR6_EXPERIMENT
-    ; Save DR6 - experiment, not safe!
-    mov     xAX, dr6
-    mov     [ss:xDI + CPUMCTX.dr6], xAX
-%endif
-
-    pop     xAX          ; saved LDTR
-    lldt    ax
-
-    add     xSP, xS      ; pCtx
-
-    ; Restore segment registers
-    MYPOPSEGS xAX, ax
-
-    ; Restore general purpose registers
-    MYPOPAD
-
-    mov     eax, VINF_SUCCESS
-
-.vmresume_end:
-    popf
-    pop     xBP
-    ret
-
-.vmxresume_invalid_vmxon_ptr:
-    ; Restore base and limit of the IDTR & GDTR
-    lidt    [xSP]
-    add     xSP, xS*2
-    lgdt    [xSP]
-    add     xSP, xS*2
-
-    pop     xAX         ; saved LDTR
-    lldt    ax
-
-    add     xSP, xS     ; pCtx
-
-    ; Restore segment registers
-    MYPOPSEGS xAX, ax
-
-    ; Restore all general purpose host registers.
-    MYPOPAD
-    mov     eax, VERR_VMX_INVALID_VMXON_PTR
-    jmp     .vmresume_end
-
-.vmxresume_start_failed:
-    ; Restore base and limit of the IDTR & GDTR
-    lidt    [xSP]
-    add     xSP, xS*2
-    lgdt    [xSP]
-    add     xSP, xS*2
-
-    pop     xAX         ; saved LDTR
-    lldt    ax
-
-    add     xSP, xS     ; pCtx
-
-    ; Restore segment registers
-    MYPOPSEGS xAX, ax
-
-    ; Restore all general purpose host registers.
-    MYPOPAD
-    mov     eax, VERR_VMX_UNABLE_TO_RESUME_VM
-    jmp     .vmresume_end
-
-ENDPROC VMXResumeVM
-
-
-%ifdef RT_ARCH_AMD64
+ENDPROC VMXR0StartVM32
+
+%ifdef RT_ARCH_AMD64
+;/**
+; * Prepares for and executes VMLAUNCH/VMRESUME (32 bits guest mode)
+; *
+; * @returns VBox status code
+; * @param   fResume    vmlauch/vmresume
+; * @param   pCtx       Guest context
+; */
+BEGINPROC VMXR0StartVM64
+    ret
+ENDPROC VMXR0StartVM64
+
 ;/**
 ; * Executes VMWRITE
 ; *
 ; * @returns VBox status code
-; * @param   idxField   x86: [ebp + 08h]  msc: rcx  gcc: edi   VMCS index
+; * @param   idxField   x86: [ebp + 08h]  msc: rcx  gcc: rdi   VMCS index
 ; * @param   pData      x86: [ebp + 0ch]  msc: rdx  gcc: rsi   VM field value
 ; */

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

@@ -642 +642 @@
             case PGMMODE_PROTECTED:     /* Protected mode, no paging. */
                 AssertFailed();
-                return VERR_PGM_UNSUPPORTED_HOST_PAGING_MODE;
+                return VERR_PGM_UNSUPPORTED_SHADOW_PAGING_MODE;
 
             case PGMMODE_32_BIT:        /* 32-bit paging. */
@@ -659 +659 @@
 #else
                 AssertFailed();
-                return VERR_PGM_UNSUPPORTED_HOST_PAGING_MODE;
+                return VERR_PGM_UNSUPPORTED_SHADOW_PAGING_MODE;
 #endif
 
             default:                    /* shut up gcc */
                 AssertFailed();
-                return VERR_PGM_UNSUPPORTED_HOST_PAGING_MODE;
+                return VERR_PGM_UNSUPPORTED_SHADOW_PAGING_MODE;
             }
         }

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

@@ -841 +841 @@
 #else
             AssertFailed();
-            return VERR_PGM_UNSUPPORTED_HOST_PAGING_MODE;
+            return VERR_PGM_UNSUPPORTED_SHADOW_PAGING_MODE;
 #endif
         default:                   /* shut up gcc */
             AssertFailed();
-            return VERR_PGM_UNSUPPORTED_HOST_PAGING_MODE;
+            return VERR_PGM_UNSUPPORTED_SHADOW_PAGING_MODE;
         }
         /* Real mode emulation using v86 mode with CR4.VME (interrupt redirection using the int bitmap in the TSS) */
@@ -960 +960 @@
     /* 64 bits guest mode? */
     if (pCtx->msrEFER & MSR_K6_EFER_LMA)
+    {
         val |= VMX_VMCS_CTRL_ENTRY_CONTROLS_IA64_MODE;
+#ifndef VBOX_WITH_64_BITS_GUESTS
+        return VERR_PGM_UNSUPPORTED_SHADOW_PAGING_MODE;
+#else
+        pVM->hwaccm.s.vmx.pfnStartVM  = VMXR0StartVM64;
+#endif
+    }
+    else
+    {
+        pVM->hwaccm.s.vmx.pfnStartVM  = VMXR0StartVM32;
+    }
 
     /* Done. */
@@ -1158 +1169 @@
     /* All done! Let's start VM execution. */
     STAM_PROFILE_ADV_START(&pVM->hwaccm.s.StatInGC, x);
-    if (pVM->hwaccm.s.vmx.fResumeVM == false)
-        rc = VMXStartVM(pCtx);
-    else
-        rc = VMXResumeVM(pCtx);
+    rc = pVM->hwaccm.s.vmx.pfnStartVM(pVM->hwaccm.s.vmx.fResumeVM, pCtx);
 
     /* In case we execute a goto ResumeExecution later on. */

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

@@ -162 +162 @@
 
 
+
+/**
+ * Prepares for and executes VMLAUNCH (32 bits guest mode)
+ *
+ * @returns VBox status code
+ * @param   fResume     vmlauch/vmresume
+ * @param   pCtx        Guest context
+ */
+DECLASM(int) VMXR0StartVM32(RTHCUINT fResume, PCPUMCTX pCtx);
+
+/**
+ * Prepares for and executes VMLAUNCH (64 bits guest mode)
+ *
+ * @returns VBox status code
+ * @param   fResume     vmlauch/vmresume
+ * @param   pCtx        Guest context
+ */
+DECLASM(int) VMXR0StartVM64(RTHCUINT fResume, PCPUMCTX pCtx);
+
 #endif /* IN_RING0 */