Changeset 80170 in vbox

Timestamp:

Aug 7, 2019 4:59:59 AM (5 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 APIC-access/virtual-APIC page nits.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/HMVMXAll.cpp (modified) (2 diffs)
• VMMR0/HMVMXR0.cpp (modified) (4 diffs)
• include/HMInternal.h (modified) (1 diff)

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

@@ -1327 +1327 @@
     pVCpu->hm.s.vmx.fSwitchedNstGstFlushTlb = true;
 
+    /** @todo Handle releasing of the page-mapping lock later. */
+#if 0
     if (pVCpu->hm.s.vmx.fVirtApicPageLocked)
     {
@@ -1332 +1334 @@
         pVCpu->hm.s.vmx.fVirtApicPageLocked = false;
     }
+#endif
 }
 

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -10013 +10013 @@
 
         /** @todo NSTVMX: This is not really correct but currently is required to make
-         *        things work. We need to re-register the page handler when we fallback to
+         *        things work. We need to re-enable the page handler when we fallback to
          *        IEM execution of the nested-guest! */
-        PGMHandlerPhysicalDeregister(pVM, GCPhysApicAccess);
-
-        void *pvPage;
-        PGMPAGEMAPLOCK PgMapLockApicAccess;
-        int rc = PGMPhysGCPhys2CCPtr(pVM, GCPhysApicAccess, &pvPage, &PgMapLockApicAccess);
+        PGMHandlerPhysicalPageTempOff(pVM, GCPhysApicAccess, GCPhysApicAccess);
+
+        void          *pvPage;
+        PGMPAGEMAPLOCK PgLockApicAccess;
+        int rc = PGMPhysGCPhys2CCPtr(pVM, GCPhysApicAccess, &pvPage, &PgLockApicAccess);
         if (RT_SUCCESS(rc))
         {
@@ -10025 +10025 @@
             AssertMsgRCReturn(rc, ("Failed to get host-physical address for APIC-access page at %#RGp\n", GCPhysApicAccess), rc);
 
-            /*
-             * We can release the page lock here because the APIC-access page is never read or
-             * written to but merely serves as a placeholder in the shadow/nested page tables
-             * to cause VM-exits or re-direct the access to the virtual-APIC page.
-             */
-            PGMPhysReleasePageMappingLock(pVCpu->CTX_SUFF(pVM), &PgMapLockApicAccess);
+            /** @todo Handle proper releasing of page-mapping lock later. */
+            PGMPhysReleasePageMappingLock(pVCpu->CTX_SUFF(pVM), &PgLockApicAccess);
         }
         else
@@ -10047 +10043 @@
     {
         Assert(pVM->hm.s.vmx.Msrs.ProcCtls.n.allowed1 & VMX_PROC_CTLS_USE_TPR_SHADOW);
-
-        void *pvPage;
         RTGCPHYS const GCPhysVirtApic = pVmcsNstGst->u64AddrVirtApic.u;
-        int rc = PGMPhysGCPhys2CCPtr(pVM, GCPhysVirtApic, &pvPage, &pVCpu->hm.s.vmx.PgMapLockVirtApic);
-        AssertMsgRCReturn(rc, ("Failed to get current-context pointer for virtual-APIC page at %#RGp\n", GCPhysVirtApic), rc);
-
-        rc = PGMPhysGCPhys2HCPhys(pVM, GCPhysVirtApic, &HCPhysVirtApic);
-        AssertMsgRCReturn(rc, ("Failed to get host-physical address for virtual-APIC page at %#RGp\n", GCPhysVirtApic), rc);
-        pVCpu->hm.s.vmx.fVirtApicPageLocked = true;
+
+        void          *pvPage;
+        PGMPAGEMAPLOCK PgLockVirtApic;
+        int rc = PGMPhysGCPhys2CCPtr(pVM, GCPhysVirtApic, &pvPage, &PgLockVirtApic);
+        if (RT_SUCCESS(rc))
+        {
+            rc = PGMPhysGCPhys2HCPhys(pVM, GCPhysVirtApic, &HCPhysVirtApic);
+            AssertMsgRCReturn(rc, ("Failed to get host-physical address for virtual-APIC page at %#RGp\n", GCPhysVirtApic), rc);
+
+            /** @todo Handle proper releasing of page-mapping lock later. */
+            PGMPhysReleasePageMappingLock(pVCpu->CTX_SUFF(pVM), &PgLockVirtApic);
+        }
+        else
+            return rc;
 
         u32TprThreshold = pVmcsNstGst->u32TprThreshold;
@@ -16725 +16727 @@
     Assert(CPUMIsGuestVmxProcCtls2Set(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS2_VIRT_APIC_ACCESS));
 
+    Log4Func(("at offset %#x type=%u\n", VMX_EXIT_QUAL_APIC_ACCESS_OFFSET(pVmxTransient->uExitQual),
+              VMX_EXIT_QUAL_APIC_ACCESS_TYPE(pVmxTransient->uExitQual)));
+
     VMXVEXITINFO ExitInfo;
     RT_ZERO(ExitInfo);

trunk/src/VBox/VMM/include/HMInternal.h

@@ -912 +912 @@
              *  nested-geust. */
             bool                        fSwitchedNstGstFlushTlb;
-
-            bool                        fVirtApicPageLocked;
             /** Alignment. */
-            bool                        afAlignment0[3];
+            bool                        afAlignment0[4];
             /** Cached guest APIC-base MSR for identifying when to map the APIC-access page. */
             uint64_t                    u64GstMsrApicBase;
-            PGMPAGEMAPLOCK              PgMapLockVirtApic;
             /** @} */