Changeset 100792 in vbox

Timestamp:

Aug 4, 2023 9:36:49 AM (16 months ago)

Author:

vboxsync

Message:

VMM/IEM: Properly deal with CPUMCTX_INHIBIT_SHADOW at the start of a TB. bugref:10369

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAllThrdRecompiler.cpp (modified) (5 diffs)
• include/IEMInternal.h (modified) (1 diff)

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

@@ -687 +687 @@
  * to apply fixes to them as well.
  *
- * @param   pVCpu   The cross context virtual CPU structure of the calling
- *                  thread.
- * @param   fReInit Clear for the first call for a TB, set for subsequent calls
- *                  from inside the compile loop where we can skip a couple of
- *                  things.
- */
-DECL_FORCE_INLINE(void) iemThreadedCompileInitDecoder(PVMCPUCC pVCpu, bool const fReInit)
+ * @param   pVCpu       The cross context virtual CPU structure of the calling
+ *                      thread.
+ * @param   fReInit     Clear for the first call for a TB, set for subsequent
+ *                      calls from inside the compile loop where we can skip a
+ *                      couple of things.
+ * @param   fExtraFlags The extra translation block flags when @a fReInit is
+ *                      true, otherwise ignored.  Only IEMTB_F_INHIBIT_SHADOW is
+ *                      checked.
+ */
+DECL_FORCE_INLINE(void) iemThreadedCompileInitDecoder(PVMCPUCC pVCpu, bool const fReInit, uint32_t const fExtraFlags)
 {
     /* ASSUMES: That iemInitExec was already called and that anyone changing
@@ -735 +738 @@
         pVCpu->iem.s.fTbBranched            = IEMBRANCHED_F_NO;
         pVCpu->iem.s.fTbCrossedPage         = false;
-        pVCpu->iem.s.cInstrTillIrqCheck     = 32;
-        pVCpu->iem.s.fTbCurInstrIsSti       = CPUMIsInInterruptShadow(&pVCpu->cpum.GstCtx); /** @todo this'll be a IEM_TB_F_XXX flag */
+        pVCpu->iem.s.cInstrTillIrqCheck     = !(fExtraFlags & IEMTB_F_INHIBIT_SHADOW) ? 32 : 0;
+        pVCpu->iem.s.fTbCurInstrIsSti       = false;
     }
     else
@@ -1341 +1344 @@
      * Now for the recomplication. (This mimicks IEMExecLots in many ways.)
      */
-    iemThreadedCompileInitDecoder(pVCpu, false /*fReInit*/);
+    iemThreadedCompileInitDecoder(pVCpu, false /*fReInit*/, fExtraFlags);
     iemThreadedCompileInitOpcodeFetching(pVCpu);
     VBOXSTRICTRC rcStrict;
@@ -1393 +1396 @@
         if (   pTb->Thrd.cCalls + 5 < pTb->Thrd.cAllocated
             && pTb->cbOpcodes + 16 <= pTb->cbOpcodesAllocated)
-            iemThreadedCompileInitDecoder(pVCpu, true /*fReInit*/);
+            iemThreadedCompileInitDecoder(pVCpu, true /*fReInit*/, 0);
         else
         {
@@ -1546 +1549 @@
 DECL_FORCE_INLINE(uint32_t) iemGetTbFlagsForCurrentPc(PVMCPUCC pVCpu)
 {
+    uint32_t fRet = IEMTB_F_TYPE_THREADED;
+
+    /*
+     * Determine the inhibit bits.
+     */
+    if (!(pVCpu->cpum.GstCtx.rflags.uBoth & (IEMTB_F_INHIBIT_SHADOW | IEMTB_F_INHIBIT_NMI)))
+    { /* typical */ }
+    else
+    {
+        if (CPUMIsInInterruptShadow(&pVCpu->cpum.GstCtx))
+            fRet |= IEMTB_F_INHIBIT_SHADOW;
+        if (CPUMAreInterruptsInhibitedByNmiEx(&pVCpu->cpum.GstCtx))
+            fRet |= IEMTB_F_INHIBIT_NMI;
+    }
+
     /*
      * Return IEMTB_F_CS_LIM_CHECKS if the current PC is invalid or if it is
      * likely to go invalid before the end of the translation block.
      */
-/** @todo must take interrupt inhibiting (shadowing) into account here! */
     if (IEM_IS_64BIT_CODE(pVCpu))
-        return IEMTB_F_TYPE_THREADED;
-
-    if (RT_LIKELY(   pVCpu->cpum.GstCtx.eip < pVCpu->cpum.GstCtx.cs.u32Limit
-                  && pVCpu->cpum.GstCtx.cs.u32Limit - pVCpu->cpum.GstCtx.eip >= X86_PAGE_SIZE))
-        return IEMTB_F_TYPE_THREADED;
-
-    return IEMTB_F_TYPE_THREADED | IEMTB_F_CS_LIM_CHECKS;
+    { /* done */ }
+    else if (RT_LIKELY(   pVCpu->cpum.GstCtx.eip < pVCpu->cpum.GstCtx.cs.u32Limit
+                       && pVCpu->cpum.GstCtx.cs.u32Limit - pVCpu->cpum.GstCtx.eip >= X86_PAGE_SIZE))
+    { /* done */ }
+    else
+        fRet |= IEMTB_F_CS_LIM_CHECKS;
+    return fRet;
 }
 

trunk/src/VBox/VMM/include/IEMInternal.h

@@ -668 +668 @@
 #define IEMTB_F_STATE_OBSOLETE          UINT32_C(0x0c000000)
 
+/** Set when we're starting the block in an "interrupt shadow".
+ * We don't need to distingish between the two types of this mask, thus the one.
+ * @see CPUMCTX_INHIBIT_SHADOW, CPUMIsInInterruptShadow() */
+#define IEMTB_F_INHIBIT_SHADOW          UINT32_C(0x10000000)
+/** Set when we're currently inhibiting NMIs
+ * @see CPUMCTX_INHIBIT_NMI, CPUMAreInterruptsInhibitedByNmi() */
+#define IEMTB_F_INHIBIT_NMI             UINT32_C(0x20000000)
+
 /** Checks that EIP/IP is wihin CS.LIM before each instruction.  Used when
  * we're close the limit before starting a TB, as determined by
  * iemGetTbFlagsForCurrentPc(). */
-#define IEMTB_F_CS_LIM_CHECKS           UINT32_C(0x10000000)
+#define IEMTB_F_CS_LIM_CHECKS           UINT32_C(0x40000000)
 
 /** Mask of the IEMTB_F_XXX flags that are part of the TB lookup key.