Changeset 105572 in vbox

Timestamp:

Aug 2, 2024 12:35:51 AM (9 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

164244

Message:

VMM/IEM: Fixed some bugs in the 2MB/4MB page invalidation code. bugref:10727

File:

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

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

@@ -798 +798 @@
      * Do the scanning.
      */
-    for (idxEven = 0; idxEven < idxEvenEnd; idxEven += 2)
+    for (; idxEven < idxEvenEnd; idxEven += 2)
     {
         if (a_fNonGlobal)
@@ -837 +837 @@
 
     GCPtrTag &= ~(RTGCPTR)(RT_BIT_64((a_f2MbLargePage ? 21 : 22) - GUEST_PAGE_SHIFT) - 1U);
-    if (   pTlb->GlobalLargePageRange.uFirstTag >= GCPtrTag
-        && pTlb->GlobalLargePageRange.uLastTag  <= GCPtrTag)
-    {
-        if (   pTlb->NonGlobalLargePageRange.uFirstTag < GCPtrTag
-            || pTlb->NonGlobalLargePageRange.uLastTag  > GCPtrTag)
+    if (   GCPtrTag >= pTlb->GlobalLargePageRange.uFirstTag
+        && GCPtrTag <= pTlb->GlobalLargePageRange.uLastTag)
+    {
+        if (   GCPtrTag < pTlb->NonGlobalLargePageRange.uFirstTag
+            || GCPtrTag > pTlb->NonGlobalLargePageRange.uLastTag)
             iemTlbInvalidateLargePageWorkerInner<a_fDataTlb, a_f2MbLargePage, true, false>(pVCpu, pTlb, GCPtrTag, GCPtrInstrBufPcTag);
         else
             iemTlbInvalidateLargePageWorkerInner<a_fDataTlb, a_f2MbLargePage, true, true>(pVCpu, pTlb, GCPtrTag, GCPtrInstrBufPcTag);
     }
-    else if (   pTlb->NonGlobalLargePageRange.uFirstTag < GCPtrTag
-             || pTlb->NonGlobalLargePageRange.uLastTag  > GCPtrTag)
+    else if (   GCPtrTag < pTlb->NonGlobalLargePageRange.uFirstTag
+             || GCPtrTag > pTlb->NonGlobalLargePageRange.uLastTag)
     { /* Large pages aren't as likely in the non-global TLB half. */ }
     else