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

Timestamp:

Jan 29, 2007 6:04:13 PM (18 years ago)

Author:

vboxsync

Message:

Fixing interrupt dispatching on amd64.

Location:

trunk/src/VBox/VMM

Files:

• TRPMInternal.h (modified) (1 diff)
• VMMR0/TRPMR0.cpp (modified) (2 diffs)
• VMMR0/TRPMR0A.asm (modified) (5 diffs)

trunk/src/VBox/VMM/TRPMInternal.h

@@ -183 +183 @@
  * Calls the interrupt gate as if we received an interrupt while in Ring-0.
  *
- * Returns with interrupts enabled.
- *
  * @param   uIP     The interrupt gate IP.
  * @param   SelCS   The interrupt gate CS.

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

@@ -34 +34 @@
 
 
-
-
 /**
  * Dispatches an interrupt that arrived while we were in the guest context.
  *
- * It's assumes we're invoked with interrupts disabled.
- * When this function returns, interrupts will be enabled.
- *
  * @param   pVM     The VM handle.
+ * @remark  Must be called with interrupts disabled.
  */
 TRPMR0DECL(void) TRPMR0DispatchHostInterrupt(PVM pVM)
@@ -189 +185 @@
      */
     uint64_t *pau = (uint64_t *)pvRet;
+    Assert(pau[1] == (uint64_t)pVM);
     pau[0] = (uint64_t)trpmR0InterruptDispatcher; /* new return address */
     pau[3] = pfnHandler.off;            /* retf off */
     pau[4] = pfnHandler.sel;            /* retf sel */
 #endif
-
-//    dprintf(("Interrupt: %04x:%08x vector %d\n", pfnHandler.sel, pfnHandler.off, uActiveVector));
 }
 

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

@@ -33 +33 @@
 ; Calls the interrupt gate as if we received an interrupt while in Ring-0.
 ;
-; Returns with interrupts enabled.
-;
 ; @param   uIP     x86:[ebp+8]   msc:rcx  gcc:rdi  The interrupt gate IP.
 ; @param   SelCS   x86:[ebp+12]  msc:dx   gcc:si   The interrupt gate CS.
@@ -44 +42 @@
 
 %ifdef __AMD64__
-    mov     rax, rsp
-    and     rsp, 15h                    ; align the stack. (do it unconditionally saves some jump mess)
+    mov     r11, rsp                    ; save the RSP for the iret frame.
+    and     rsp, ~15h                   ; align the stack. (do it unconditionally saves some jump mess)
 
     ; switch stack?
@@ -61 +59 @@
     ; create the iret frame
     push    0                           ; SS
-    push    rax                         ; RSP
+    push    r11                         ; RSP
     pushfd                              ; RFLAGS
     and     dword [rsp], ~X86_EFL_IF
     mov     ax, cs
     push    rax                         ; CS
-    mov     rax, .return                ; RIP
-    push    rax
+    lea     r10, [.return wrt rip]      ; RIP
+    push    r10
 
     ; create the retf frame
  %ifdef ASM_CALL64_MSC
     movzx   rdx, dx
+    cmp     rdx, r11
+    je      .dir_jump
     push    rdx
     push    rcx
  %else
-    movzx   rdi, di
+    movzx   rsi, si
+    cmp     rsi, r11
+    je      .dir_jump
+    push    rsi
     push    rdi
-    push    rsi
  %endif
 
-    ; dispatch it!
+    ; dispatch it
     db 048h
     retf
+
+    ; dispatch it by a jmp (don't mess up the IST stack)
+.dir_jump:
+ %ifdef ASM_CALL64_MSC
+    jmp     rcx
+ %else
+    jmp     rdi
+ %endif
 
 %else ; 32-bit:
@@ -102 +112 @@
 %endif
 .return:
+    cli
 
     leave
@@ -132 +143 @@
 ;           10  retf offset   (interrupt handler)
 ;            8  uOperation
-;            0  pVM
+;            0  pVM (rsp here)
 ;
 BEGINPROC trpmR0InterruptDispatcher
 %ifdef __AMD64__
     lea     rsp, [rsp + 10h]            ; skip pVM and uOperation
+    swapgs
     db 48h
     retf