Changeset 43867 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Nov 13, 2012 5:23:34 PM (12 years ago)

Author:

vboxsync

Message:

Do not inject events into VMCB in VM exit path. Fixes hangs immediately after VM reset.

File:

• trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp (modified) (9 diffs)

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

@@ -514 +514 @@
 }
 
+/**
+ * Posts a pending event (trap or external interrupt). An injected event should only
+ * be written to the VMCB immediately before VMRUN, otherwise we might have stale events
+ * injected across VM resets and suchlike. See @bugref{6220}.
+ *
+ * @param   pVCpu       Pointer to the VMCPU.
+ * @param   pCtx        Pointer to the guest CPU context.
+ * @param   pIntInfo    Pointer to the SVM interrupt info.
+ */
+DECLINLINE(void) hmR0SvmSetPendingEvent(PVMCPU pVCpu, SVM_EVENT *pEvent)
+{
+#ifdef VBOX_STRICT
+    Log(("SVM: Set pending event: intInfo=%016llx\n", pEvent->au64[0]));
+#endif
+
+    /* If there's an event pending already, we're in trouble... */
+    Assert(!pVCpu->hm.s.Event.fPending);
+
+    /* Set pending event state. */
+    pVCpu->hm.s.Event.intInfo  = pEvent->au64[0];
+    pVCpu->hm.s.Event.fPending = true;
+}
 
 /**
@@ -1873 +1895 @@
                 Event.n.u8Vector = X86_XCPT_DB;
 
-                hmR0SvmInjectEvent(pVCpu, pvVMCB, pCtx, &Event);
+                hmR0SvmSetPendingEvent(pVCpu, &Event);
                 goto ResumeExecution;
             }
@@ -1907 +1929 @@
             Event.n.u8Vector = X86_XCPT_NM;
 
-            hmR0SvmInjectEvent(pVCpu, pvVMCB, pCtx, &Event);
+            hmR0SvmSetPendingEvent(pVCpu, &Event);
             goto ResumeExecution;
         }
@@ -1936 +1958 @@
                 Event.n.u32ErrorCode        = errCode;
 
-                hmR0SvmInjectEvent(pVCpu, pvVMCB, pCtx, &Event);
+                hmR0SvmSetPendingEvent(pVCpu, &Event);
                 goto ResumeExecution;
             }
@@ -2010 +2032 @@
                 Event.n.u32ErrorCode        = errCode;
 
-                hmR0SvmInjectEvent(pVCpu, pvVMCB, pCtx, &Event);
+                hmR0SvmSetPendingEvent(pVCpu, &Event);
                 goto ResumeExecution;
             }
@@ -2039 +2061 @@
             Event.n.u8Vector = X86_XCPT_MF;
 
-            hmR0SvmInjectEvent(pVCpu, pvVMCB, pCtx, &Event);
+            hmR0SvmSetPendingEvent(pVCpu, &Event);
             goto ResumeExecution;
         }
@@ -2084 +2106 @@
             }
             Log(("Trap %x at %04x:%RGv esi=%x\n", vector, pCtx->cs.Sel, (RTGCPTR)pCtx->rip, pCtx->esi));
-            hmR0SvmInjectEvent(pVCpu, pvVMCB, pCtx, &Event);
+            hmR0SvmSetPendingEvent(pVCpu, &Event);
             goto ResumeExecution;
         }
@@ -2564 +2586 @@
                             Event.n.u8Vector = X86_XCPT_DB;
 
-                            hmR0SvmInjectEvent(pVCpu, pvVMCB, pCtx, &Event);
+                            hmR0SvmSetPendingEvent(pVCpu, &Event);
                             goto ResumeExecution;
                         }
@@ -2665 +2687 @@
 
         Log(("Forced #UD trap at %RGv\n", (RTGCPTR)pCtx->rip));
-        hmR0SvmInjectEvent(pVCpu, pvVMCB, pCtx, &Event);
+        hmR0SvmSetPendingEvent(pVCpu, &Event);
         goto ResumeExecution;
     }