Changeset 79975 in vbox

Timestamp:

Jul 25, 2019 9:39:39 AM (6 years ago)

Author:

vboxsync

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

132406

Message:

VMM/IEM: Nested VMX: bugref:9180 If we are de-registering the page before executing the nested-guest using hardware-assisted VMX, we would need to re-register it when we fallback to IEM execution of the nested-guest to trap memory accesses to the APIC-access page again. Disabled for now.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAll.cpp (modified) (1 diff)

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

@@ -1124 +1124 @@
     if (!pVCpu->iem.s.fInPatchCode)
         CPUMRawLeave(pVCpu, VINF_SUCCESS);
+#endif
+#if 0
+#if defined(VBOX_WITH_NESTED_HWVIRT_VMX) && !defined(IN_RC)
+    if (    CPUMIsGuestInVmxNonRootMode(&pVCpu->cpum.GstCtx)
+        &&  CPUMIsGuestVmxProcCtls2Set(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS2_VIRT_APIC_ACCESS))
+    {
+        PCVMXVVMCS pVmcs = pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pVmcs);
+        Assert(pVmcs);
+        RTGCPHYS const GCPhysApicAccess = pVmcs->u64AddrApicAccess.u;
+        if (!PGMHandlerPhysicalIsRegistered(pVCpu->CTX_SUFF(pVM), GCPhysApicAccess))
+        {
+           int rc = PGMHandlerPhysicalRegister(pVCpu->CTX_SUFF(pVM), GCPhysApicAccess, GCPhysApicAccess + X86_PAGE_4K_SIZE - 1,
+                                               pVCpu->iem.s.hVmxApicAccessPage, NIL_RTR3PTR /* pvUserR3 */,
+                                               NIL_RTR0PTR /* pvUserR0 */,  NIL_RTRCPTR /* pvUserRC */, NULL /* pszDesc */);
+           AssertRC(rc);
+        }
+    }
+#endif
 #endif
 }