Changeset 75611 in vbox for trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

Timestamp:

Nov 20, 2018 11:20:25 AM (6 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:9180 Move the VMX APIC-access guest-physical page registration into IEM and got rid of the CPUM all context code that does not quite fit because we still have to declare the prototypes in the HM headers anyway, so just keep it in HM all context code for now.

File:

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

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

@@ -2729 +2729 @@
     PCVMXVVMCS pVmcs = pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pVmcs);
     bool const fHostInLongMode = RT_BOOL(pVmcs->u32ExitCtls & VMX_EXIT_CTLS_HOST_ADDR_SPACE_SIZE);
-    bool const fVirtApicAccess = RT_BOOL(pVmcs->u32ProcCtls2 & VMX_PROC_CTLS2_VIRT_APIC_ACCESS);
 
     /* We cannot return from a long-mode guest to a host that is not in long mode. */
@@ -2757 +2756 @@
 
     /* De-register the handler for the APIC-access page. */
-    if (fVirtApicAccess)
-    {
+    if (pVmcs->u32ProcCtls2 & VMX_PROC_CTLS2_VIRT_APIC_ACCESS)
+    {
+        PVM pVM = pVCpu->CTX_SUFF(pVM);
         RTGCPHYS const GCPhysApicAccess = pVmcs->u64AddrApicAccess.u;
-        int rc = CPUMVmxApicAccessPageDeregister(pVCpu, GCPhysApicAccess);
-        if (RT_FAILURE(rc))
-            return rc;
+        if (PGMHandlerPhysicalIsRegistered(pVM, GCPhysApicAccess))
+        {
+            /** @todo NSTVMX: This is broken! We cannot simply deregister the handler for the
+             *        physical address as other VCPUs executing other nested-VCPUs might have
+             *        it registered! */
+            int rc = PGMHandlerPhysicalDeregister(pVM, GCPhysApicAccess);
+            if (RT_FAILURE(rc))
+                return rc;
+        }
     }
 
@@ -3044 +3050 @@
         Assert(pbIoBitmapA);
         Assert(pbIoBitmapB);
-        return CPUMVmxGetIoBitmapPermission(pbIoBitmapA, pbIoBitmapB, u16Port, cbAccess);
+        return HMVmxGetIoBitmapPermission(pbIoBitmapA, pbIoBitmapB, u16Port, cbAccess);
     }
 
@@ -6334 +6340 @@
 
         /* Register the handler for the APIC-access page. */
-        int rc = CPUMVmxApicAccessPageRegister(pVCpu, GCPhysApicAccess);
+        int rc = PGMHandlerPhysicalRegister(pVCpu->CTX_SUFF(pVM), GCPhysApicAccess, GCPhysApicAccess,
+                                            pVCpu->iem.s.hVmxApicAccessPage, NIL_RTR3PTR /* pvUserR3 */,
+                                            NIL_RTR0PTR /* pvUserR0 */,  NIL_RTRCPTR /* pvUserRC */, NULL /* pszDesc */);
         if (RT_FAILURE(rc))
             IEM_VMX_VMENTRY_FAILED_RET(pVCpu, pszInstr, pszFailure, kVmxVDiag_Vmentry_AddrApicAccessHandlerReg);
@@ -7057 +7065 @@
         {
             VMXMSREXITREAD enmRead;
-            int rc = CPUMVmxGetMsrPermission(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvMsrBitmap), idMsr, &enmRead,
+            int rc = HMVmxGetMsrPermission(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvMsrBitmap), idMsr, &enmRead,
                                              NULL /* penmWrite */);
             AssertRC(rc);
@@ -7066 +7074 @@
         {
             VMXMSREXITWRITE enmWrite;
-            int rc = CPUMVmxGetMsrPermission(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvMsrBitmap), idMsr, NULL /* penmRead */,
+            int rc = HMVmxGetMsrPermission(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvMsrBitmap), idMsr, NULL /* penmRead */,
                                              &enmWrite);
             AssertRC(rc);