Changeset 92706 in vbox

Timestamp:

Dec 2, 2021 12:59:49 PM (3 years ago)

Author:

vboxsync

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

148605

Message:

VMM: Nested VMX: bugref:10092 EPT misconfig bits and note about assertion in iemVmxVmexit.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAll.cpp (modified) (3 diffs)
• IEMAllCImplVmxInstr.cpp.h (modified) (1 diff)

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

@@ -1443 +1443 @@
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
         if (Walk.fFailed & PGM_WALKFAIL_EPT)
-        {
-            Assert(IEM_VMX_IS_NON_ROOT_MODE(pVCpu));
             IEM_VMX_VMEXIT_EPT_RET(pVCpu, &Walk, IEM_ACCESS_INSTRUCTION, IEM_SLAT_FAIL_LINEAR_TO_PHYS_ADDR, 0 /* cbInstr */);
-        }
 #endif
         return iemRaisePageFault(pVCpu, GCPtrPC, IEM_ACCESS_INSTRUCTION, rc);
@@ -1454 +1451 @@
     {
         Log(("iemInitDecoderAndPrefetchOpcodes: %RGv - supervisor page\n", GCPtrPC));
+#ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
+        if (Walk.fFailed & PGM_WALKFAIL_EPT)
+            IEM_VMX_VMEXIT_EPT_RET(pVCpu, &Walk, IEM_ACCESS_INSTRUCTION, IEM_SLAT_FAIL_LINEAR_TO_PAGE_TABLE, 0 /* cbInstr */);
+#endif
         return iemRaisePageFault(pVCpu, GCPtrPC, IEM_ACCESS_INSTRUCTION, VERR_ACCESS_DENIED);
     }
@@ -1460 +1461 @@
     {
         Log(("iemInitDecoderAndPrefetchOpcodes: %RGv - NX\n", GCPtrPC));
+#ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
+        if (Walk.fFailed & PGM_WALKFAIL_EPT)
+            IEM_VMX_VMEXIT_EPT_RET(pVCpu, &Walk, IEM_ACCESS_INSTRUCTION, IEM_SLAT_FAIL_LINEAR_TO_PAGE_TABLE, 0 /* cbInstr */);
+#endif
         return iemRaisePageFault(pVCpu, GCPtrPC, IEM_ACCESS_INSTRUCTION, VERR_ACCESS_DENIED);
     }

trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

@@ -2413 +2413 @@
  * @param   uExitReason     The VM-exit reason.
  * @param   u64ExitQual     The Exit qualification.
+ *
+ * @remarks We need not necessarily have completed VM-entry before a VM-exit is
+ *          called. Failures during VM-entry can cause VM-exits as well, so we
+ *          -cannot- assert we're in VMX non-root mode here.
  */
 IEM_STATIC VBOXSTRICTRC iemVmxVmexit(PVMCPUCC pVCpu, uint32_t uExitReason, uint64_t u64ExitQual)