Changeset 96958 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Sep 30, 2022 9:15:44 PM (2 years ago)

Author:

vboxsync

Message:

VMM/PGM: Made the APIC access page related optimizations for nested VMs configurable via PGM_WITH_NESTED_APIC_ACCESS_PAGE define in PGMInternal.h, leaving it disabled for now till things are working. bugref:10092

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (4 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -1786 +1786 @@
             )
     {
-#   if defined(VBOX_WITH_NESTED_HWVIRT_VMX) && PGM_SHW_TYPE == PGM_TYPE_EPT
+#   if defined(VBOX_WITH_NESTED_HWVIRT_VMX) && PGM_SHW_TYPE == PGM_TYPE_EPT && defined(PGM_WITH_NESTED_APIC_ACCESS_PAGE)
         /*
          * If an "ALL" access handler has been registered for the VMX APIC-access page,
@@ -2577 +2577 @@
     SHWPTE Pte;
     uint64_t const fGstShwPteFlags = pGstWalkAll->u.Ept.Pte.u & pVCpu->pgm.s.fGstEptShadowedPteMask;
-    if (PGM_PAGE_HAS_ACTIVE_HANDLERS(pPage))
-    {
+    if (!PGM_PAGE_HAS_ACTIVE_HANDLERS(pPage))
+    {
+        Pte.u = PGM_PAGE_GET_HCPHYS(pPage) | fGstShwPteFlags;
+Log7Func(("regular page (%R[pgmpage]) at %RGp -> %RX64\n", pPage, GCPhysPage, Pte.u));
+    }
+    else if (!PGM_PAGE_HAS_ACTIVE_ALL_HANDLERS(pPage))
+    {
+        /** @todo access bit. */
+        Pte.u = PGM_PAGE_GET_HCPHYS(pPage) | (fGstShwPteFlags & ~EPT_E_WRITE);
+        Log7Func(("monitored page (%R[pgmpage]) at %RGp -> %RX64\n", pPage, GCPhysPage, Pte.u));
+    }
+    else
+    {
+# if defined(PGM_WITH_NESTED_APIC_ACCESS_PAGE)
         if (CPUMIsGuestVmxApicAccessPageAddr(pVCpu, GCPhysPage))
         {
@@ -2584 +2596 @@
             Log7Func(("APIC-access page at %RGp -> shadowing nested-hypervisor %RX64 (%RGp)\n", GCPhysPage, fGstShwPteFlags, pShwPage->GCPhys));
         }
+#  if 0 /** @todo r=bird: What on earth is the rational for this? */
         else if (!PGM_PAGE_HAS_ACTIVE_ALL_HANDLERS(pPage))
         {
-            Assert(!CPUMIsGuestVmxApicAccessPageAddr(pVCpu, GCPhysPage));
             if (fGstShwPteFlags & EPT_E_WRITE)
             {
@@ -2595 +2607 @@
             Log7Func(("monitored page (%R[pgmpage]) at %RGp -> shadowing nested-hypervisor %RX64\n", pPage, GCPhysPage, fGstShwPteFlags));
         }
+#  endif
         else
-        {
+# endif
+        {
+# if defined(PGM_WITH_NESTED_APIC_ACCESS_PAGE)
             /** @todo Track using fVirtVmxApicAccess bit in PGMPHYSHANDLER and maybe in PGMPAGE
              *        too? */
+            /** @todo r=bird: this is wrong for device passthru among other scenarios.   */
             PGMHandlerPhysicalDeregister(pVCpu->CTX_SUFF(pVM), GCPhysPage);
             Pte.u = PGM_PAGE_GET_HCPHYS(pPage) | fGstShwPteFlags;
             Log7Func(("MMIO at %RGp potentially former VMX APIC-access page -> unregistered\n", GCPhysPage));
-        }
-    }
-    else
-        Pte.u = PGM_PAGE_GET_HCPHYS(pPage) | fGstShwPteFlags;
+# else
+            /** @todo Do MMIO optimizations here too? */
+            Log7Func(("mmio page (%R[pgmpage]) at %RGp -> 0\n", pPage, GCPhysPage));
+            Pte.u = 0;
+# endif
+        }
+    }
 
     /* Make sure only allocated pages are mapped writable. */