Changeset 100790 in vbox

Timestamp:

Aug 4, 2023 8:53:14 AM (16 months ago)

Author:

vboxsync

Message:

VMM/IEM: Don't generate IRQ checks as the first call in a code block, it prevents anything from getting done if we get the IRQ/NMI scheduling conditions wrong. Account for instructions executed in iemThreadedTbExec when completing blocks. bugref:10369

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAllThrdFuncsBltIn.cpp (modified) (1 diff)
• IEMAllThrdRecompiler.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllThrdFuncsBltIn.cpp

@@ -109 +109 @@
                                   | VMCPU_FF_TLB_FLUSH
                                   | VMCPU_FF_UNHALT );
+    /** @todo this isn't even close to the NMI and interrupt conditions in EM! */
     if (RT_LIKELY(   (   !fCpu
                       || (   !(fCpu & ~(VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC))

trunk/src/VBox/VMM/VMMAll/IEMAllThrdRecompiler.cpp

@@ -1194 +1194 @@
     fCpu &= VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC | VMCPU_FF_INTERRUPT_NMI | VMCPU_FF_INTERRUPT_SMI;
 #if 1
+    /** @todo this isn't even close to the NMI/IRQ conditions in EM. */
     if (RT_LIKELY(   !fCpu
                   || (   !(fCpu & ~(VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC))
@@ -1221 +1222 @@
 {
     /*
-     * Skip this we've already emitted a call after the previous instruction.
+     * Skip this we've already emitted a call after the previous instruction
+     * or if it's the first call, as we're always checking FFs between blocks.
      */
     uint32_t const idxCall = pTb->Thrd.cCalls;
-    if (   idxCall == 0
-        || pTb->Thrd.paCalls[idxCall - 1].enmFunction != kIemThreadedFunc_BltIn_CheckIrq)
+    if (   idxCall > 0
+        && pTb->Thrd.paCalls[idxCall - 1].enmFunction != kIemThreadedFunc_BltIn_CheckIrq)
     {
         /* Emit the call. */
@@ -1328 +1330 @@
     pVCpu->iem.s.pCurTbR3 = pTb;
 
+#if 0
+    /* Make sure the CheckIrq condition matches the one in EM. */
+    iemThreadedCompileCheckIrqAfter(pVCpu, pTb);
+    const uint32_t cZeroCalls = 1;
+#else
+    const uint32_t cZeroCalls = 0;
+#endif
+
     /*
      * Now for the recomplication. (This mimicks IEMExecLots in many ways.)
@@ -1362 +1372 @@
                 rcStrict = VINF_SUCCESS;
 
-            if (pTb->Thrd.cCalls > 0)
+            if (pTb->Thrd.cCalls > cZeroCalls)
             {
                 if (cCallsPrev != pTb->Thrd.cCalls)
@@ -1456 +1466 @@
                                                                                           pCallEntry->auParams[1],
                                                                                           pCallEntry->auParams[2]);
-
         if (RT_LIKELY(   rcStrict == VINF_SUCCESS
                       && pVCpu->iem.s.rcPassUp == VINF_SUCCESS /** @todo this isn't great. */))
@@ -1472 +1481 @@
     }
 
+    pVCpu->iem.s.cInstructions += pTb->cInstructions;
     pVCpu->iem.s.pCurTbR3 = NULL;
     return VINF_SUCCESS;
@@ -1606 +1616 @@
                                                   | VMCPU_FF_TLB_FLUSH
                                                   | VMCPU_FF_UNHALT );
+                    /** @todo this isn't even close to the NMI/IRQ conditions in EM. */
                     if (RT_LIKELY(   (   !fCpu
                                       || (   !(fCpu & ~(VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC))
-                                          && !pVCpu->cpum.GstCtx.rflags.Bits.u1IF) )
+                                          && (   !pVCpu->cpum.GstCtx.rflags.Bits.u1IF
+                                              || CPUMIsInInterruptShadow(&pVCpu->cpum.GstCtx) )) )
                                   && !VM_FF_IS_ANY_SET(pVM, VM_FF_ALL_MASK) ))
                     {