Changeset 41072 in vbox for trunk/src/VBox/VMM/VMMAll/EMAll.cpp

Timestamp:

Apr 26, 2012 4:35:04 PM (13 years ago)

Author:

vboxsync

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

77640

Message:

VMM: fix VERR_PAGE_TABLE_NOT_PRESENT guru meditation caused by failing to disassemble an instruction because the guest's PDE/PTE is invalid, see #6043 for details.

File:

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

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

@@ -360 +360 @@
         if (PAGE_ADDRESS(InstrGC) == PAGE_ADDRESS(InstrGC + sizeof(State.aOpcode) - 1))
         {
-           if (rc == VERR_PAGE_TABLE_NOT_PRESENT)
-              HWACCMInvalidatePage(pVCpu, InstrGC);
+            /*
+             * If we fail to find the page via the guest's page tables we invalidate the page
+             * in the host TLB (pertaining to the guest in the NestedPaging case). See #6043
+             */
+            if (rc == VERR_PAGE_TABLE_NOT_PRESENT || rc == VERR_PAGE_NOT_PRESENT)
+                HWACCMInvalidatePage(pVCpu, InstrGC);
 
            Log(("emDisCoreOne: read failed with %d\n", rc));
@@ -449 +453 @@
         if (PAGE_ADDRESS(GCPtrInstr) == PAGE_ADDRESS(GCPtrInstr + sizeof(State.aOpcode) - 1))
         {
-           if (rc == VERR_PAGE_TABLE_NOT_PRESENT)
-              HWACCMInvalidatePage(pVCpu, GCPtrInstr);
+            /*
+             * If we fail to find the page via the guest's page tables we invalidate the page
+             * in the host TLB (pertaining to the guest in the NestedPaging case). See #6043
+             */
+            if (rc == VERR_PAGE_TABLE_NOT_PRESENT || rc == VERR_PAGE_NOT_PRESENT)
+                HWACCMInvalidatePage(pVCpu, GCPtrInstr);
 
            Log(("EMInterpretDisasOneEx: read failed with %d\n", rc));