Changeset 23220 in vbox for trunk

Timestamp:

Sep 22, 2009 2:37:01 PM (15 years ago)

Author:

vboxsync

Message:

Properly emulate task switches caused by IDT gates (VT-x & AMD-V)

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.cpp (modified) (1 diff)
• HWVMXR0.cpp (modified) (1 diff)

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

@@ -2408 +2408 @@
     }
 
+    case SVM_EXIT_TASK_SWITCH:          /* too complicated to emulate, so fall back to the recompiler*/
+        Log(("SVM_EXIT_TASK_SWITCH: exit2=%RX64\n", pVMCB->ctrl.u64ExitInfo2));
+        if (    !(pVMCB->ctrl.u64ExitInfo2 & (SVM_EXIT2_TASK_SWITCH_IRET | SVM_EXIT2_TASK_SWITCH_JMP))
+            &&  pVCpu->hwaccm.s.Event.fPending)
+        {
+            SVM_EVENT Event;
+
+            Event.au64[0] = pVCpu->hwaccm.s.Event.intInfo;
+
+            /* Caused by an injected interrupt. */
+            pVCpu->hwaccm.s.Event.fPending = false;
+
+            switch (Event.n.u3Type)
+            {
+            case SVM_EVENT_EXTERNAL_IRQ:
+            case SVM_EVENT_NMI:
+                Log(("SVM_EXIT_TASK_SWITCH: reassert trap %d\n", Event.n.u8Vector));
+                Assert(!Event.n.u1ErrorCodeValid);
+                rc = TRPMAssertTrap(pVCpu, Event.n.u8Vector, TRPM_HARDWARE_INT);
+                AssertRC(rc);
+                break;
+
+            default:
+                /* Exceptions and software interrupts can just be restarted. */
+                break;
+            }
+        }
+        rc = VERR_EM_INTERPRETER;
+        break;
+
     case SVM_EXIT_MONITOR:
     case SVM_EXIT_PAUSE:
     case SVM_EXIT_MWAIT_ARMED:
-    case SVM_EXIT_TASK_SWITCH:          /* can change CR3; emulate */
         rc = VERR_EM_INTERPRETER;
         break;

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

@@ -3829 +3829 @@
         break;
 
-    case VMX_EXIT_TASK_SWITCH:          /* 9 Task switch. */
+    case VMX_EXIT_TASK_SWITCH:          /* 9 Task switch: too complicated to emulate, so fall back to the recompiler */
+        Log(("VMX_EXIT_TASK_SWITCH: exit=%RX64\n", exitQualification));
+        if (    (VMX_EXIT_QUALIFICATION_TASK_SWITCH_TYPE(exitQualification) == VMX_EXIT_QUALIFICATION_TASK_SWITCH_TYPE_IDT)
+            &&  pVCpu->hwaccm.s.Event.fPending)
+        {
+            /* Caused by an injected interrupt. */
+            pVCpu->hwaccm.s.Event.fPending = false;
+
+            Log(("VMX_EXIT_TASK_SWITCH: reassert trap %d\n", VMX_EXIT_INTERRUPTION_INFO_VECTOR(pVCpu->hwaccm.s.Event.intInfo)));
+            Assert(!VMX_EXIT_INTERRUPTION_INFO_ERROR_CODE_IS_VALID(pVCpu->hwaccm.s.Event.intInfo));
+            rc = TRPMAssertTrap(pVCpu, VMX_EXIT_INTERRUPTION_INFO_VECTOR(pVCpu->hwaccm.s.Event.intInfo), TRPM_HARDWARE_INT);
+            AssertRC(rc);
+        }
+        else
+            /* Exceptions and software interrupts can just be restarted. */
         rc = VERR_EM_INTERPRETER;
         break;