Changeset 92686 in vbox

Timestamp:

Dec 2, 2021 8:41:22 AM (3 years ago)

Author:

vboxsync

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

148585

Message:

VMM/IEM: Nested VMX: bugref:10092 EPT misconfig bits.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (5 diffs)

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

@@ -764 +764 @@
 DECL_FORCE_INLINE(void) iemVmxVmcsSetExitGuestLinearAddr(PVMCPUCC pVCpu, uint64_t uGuestLinearAddr)
 {
+    /* Bits 63:32 of guest-linear address MBZ if the guest isn't in long mode prior to the VM-exit. */
+    Assert(CPUMIsGuestInLongModeEx(IEM_GET_CTX(pVCpu)) || !(uGuestLinearAddr & UINT64_C(0xffffffff00000000)));
     pVCpu->cpum.GstCtx.hwvirt.vmx.Vmcs.u64RoGuestLinearAddr.u = uGuestLinearAddr;
 }
@@ -3686 +3688 @@
 
 /**
+ * VMX VM-exit handler for EPT misconfiguration.
+ *
+ * @param   pVCpu       The cross context virtual CPU structure.
+ * @param   GCPhysAddr  The physical address causing the EPT misconfiguration. This
+ *                      must be page aligned.
+ */
+IEM_STATIC VBOXSTRICTRC iemVmxVmexitEptMisconfig(PVMCPUCC pVCpu, RTGCPHYS GCPhysAddr)
+{
+    Assert(!(GCPhysAddr & PAGE_OFFSET_MASK));
+    iemVmxVmcsSetExitGuestPhysAddr(pVCpu, GCPhysAddr);
+    return iemVmxVmexit(pVCpu, VMX_EXIT_EPT_MISCONFIG, 0 /* u64ExitQual */);
+}
+
+
+/**
  * VMX VM-exit handler for EPT violation.
  *
@@ -3692 +3709 @@
  * @param   fSlatFail           The SLAT failure info, IEM_SLAT_FAIL_XXX.
  * @param   fEptAccess          The EPT paging structure bits.
- * @param   GCPhysAddr          The physical address causing the EPT violation.
+ * @param   GCPhysAddr          The physical address causing the EPT violation. This
+ *                              must be page aligned.
  * @param   fIsLinearAddrValid  Whether translation of a linear address caused this
  *                              EPT violation. If @c false, GCPtrAddr must be 0.
@@ -3707 +3725 @@
      */
     Assert(fLinearAddrValid || GCPtrAddr == 0);
+    Assert(!(GCPhysAddr & PAGE_OFFSET_MASK));
 
     uint64_t const fCaps = pVCpu->cpum.GstCtx.hwvirt.vmx.Msrs.u64EptVpidCaps;
@@ -3771 +3790 @@
                                         pWalk->GCPtr, cbInstr);
     }
-    else
-    {
-        Assert(pWalk->fFailed & PGM_WALKFAIL_EPT_MISCONFIG);
-        /** @todo Do EPT misconfig. */
-        return VERR_NOT_IMPLEMENTED;
-    }
+
+    Assert(pWalk->fFailed & PGM_WALKFAIL_EPT_MISCONFIG);
+    return iemVmxVmexitEptMisconfig(pVCpu, pWalk->GCPhysNested);
 }