Changeset 105250 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Jul 10, 2024 1:47:33 AM (7 months ago)

Author:

vboxsync

Message:

VMM/IEM: invlpg assertion fix + optimization. bugref:10687

File:

• trunk/src/VBox/VMM/VMMAll/IEMAll.cpp (modified) (3 diffs)

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

@@ -740 +740 @@
      * G bit to accomplish this.
      */
-    bool fMaybeLargePage = true;
+    int fMaybeLargePage = -1;
     if (pTlb->aEntries[idxEven].uTag == (GCPtrTag | pTlb->uTlbRevision))
     {
@@ -786 +786 @@
                 if ((pTlb->aEntries[idxEven].uTag & GCPtrTagMask) == GCPtrTag)
                 {
-                    Assert(pTlb->aEntries[idxEven].fFlagsAndPhysRev & IEMTLBE_F_PT_LARGE_PAGE); /* bad guest */
-                    pTlb->aEntries[idxEven].uTag = 0;
-                    if (!a_fDataTlb && GCPtrTag == GCPtrInstrBufPcTag)
-                        pVCpu->iem.s.cbInstrBufTotal = 0;
+                    if (pTlb->aEntries[idxEven].fFlagsAndPhysRev & IEMTLBE_F_PT_LARGE_PAGE)
+                    {
+                        pTlb->aEntries[idxEven].uTag = 0;
+                        if (!a_fDataTlb && GCPtrTag == GCPtrInstrBufPcTag)
+                            pVCpu->iem.s.cbInstrBufTotal = 0;
+                        fMaybeLargePage = true;
+                    }
+                    else
+                    {
+                        Assert(fMaybeLargePage == -1);
+                        break;
+                    }
                 }
                 if ((pTlb->aEntries[idxEven + 1].uTag & GCPtrTagMask) == GCPtrTagGlob)
                 {
-                    Assert(pTlb->aEntries[idxEven + 1].fFlagsAndPhysRev & IEMTLBE_F_PT_LARGE_PAGE); /* bad guest */
-                    pTlb->aEntries[idxEven + 1].uTag = 0;
-                    if (!a_fDataTlb && GCPtrTag == GCPtrInstrBufPcTag)
-                        pVCpu->iem.s.cbInstrBufTotal = 0;
+                    if (pTlb->aEntries[idxEven + 1].fFlagsAndPhysRev & IEMTLBE_F_PT_LARGE_PAGE)
+                    {
+                        pTlb->aEntries[idxEven + 1].uTag = 0;
+                        if (!a_fDataTlb && GCPtrTag == GCPtrInstrBufPcTag)
+                            pVCpu->iem.s.cbInstrBufTotal = 0;
+                        fMaybeLargePage = true;
+                    }
+                    else
+                    {
+                        Assert(fMaybeLargePage == -1);
+                        break;
+                    }
                 }
                 GCPtrTag++;
@@ -823 +839 @@
                 if ((pTlb->aEntries[idxEven].uTag & GCPtrTagMask) == GCPtrTag)
                 {
-                    Assert(pTlb->aEntries[idxEven].fFlagsAndPhysRev & IEMTLBE_F_PT_LARGE_PAGE); /* bad guest */
-                    pTlb->aEntries[idxEven].uTag = 0;
-                    if (!a_fDataTlb && GCPtrTag == GCPtrInstrBufPcTag)
-                        pVCpu->iem.s.cbInstrBufTotal = 0;
+                    if (pTlb->aEntries[idxEven].fFlagsAndPhysRev & IEMTLBE_F_PT_LARGE_PAGE)
+                    {
+                        pTlb->aEntries[idxEven].uTag = 0;
+                        if (!a_fDataTlb && GCPtrTag == GCPtrInstrBufPcTag)
+                            pVCpu->iem.s.cbInstrBufTotal = 0;
+                        fMaybeLargePage = true;
+                    }
+                    else
+                    {
+                        Assert(fMaybeLargePage == -1);
+                        break;
+                    }
                 }
                 if ((pTlb->aEntries[idxEven + 1].uTag & GCPtrTagMask) == GCPtrTagGlob)
                 {
-                    Assert(pTlb->aEntries[idxEven + 1].fFlagsAndPhysRev & IEMTLBE_F_PT_LARGE_PAGE); /* bad guest */
-                    pTlb->aEntries[idxEven + 1].uTag = 0;
-                    if (!a_fDataTlb && GCPtrTag == GCPtrInstrBufPcTag)
-                        pVCpu->iem.s.cbInstrBufTotal = 0;
+                    if (pTlb->aEntries[idxEven + 1].fFlagsAndPhysRev & IEMTLBE_F_PT_LARGE_PAGE)
+                    {
+                        pTlb->aEntries[idxEven + 1].uTag = 0;
+                        if (!a_fDataTlb && GCPtrTag == GCPtrInstrBufPcTag)
+                            pVCpu->iem.s.cbInstrBufTotal = 0;
+                        fMaybeLargePage = true;
+                    }
+                    else
+                    {
+                        Assert(fMaybeLargePage == -1);
+                        break;
+                    }
                 }
                 GCPtrTag++;