Changeset 97148 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Oct 14, 2022 6:49:50 AM (3 years ago)

Author:

vboxsync

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

154121

Message:

VMM/HMVMXR0: Nested VMX: bugref:10092 We no longer need to play around with PGMHandlerPhysicalPageTempOff in VT-x code for the virtual-APIC page since introduction of PGMPHYSHANDLER_F_NOT_IN_HM.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (2 diffs)

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

@@ -5623 +5623 @@
         RTGCPHYS const GCPhysApicAccess = pVmcsNstGst->u64AddrApicAccess.u;
 
-        /* Disabling this since we adjust the shadow page table permissions in (SyncHandlerPte). */
-#if 0
-        /** @todo NSTVMX: This is not really correct but currently is required to make
-         *        things work. We need to re-enable the page handler when we fallback to
-         *        IEM execution of the nested-guest! */
-        PGMHandlerPhysicalPageTempOff(pVM, GCPhysApicAccess, GCPhysApicAccess);
-#endif
-
         void          *pvPage;
         PGMPAGEMAPLOCK PgLockApicAccess;
@@ -6559 +6551 @@
             break;
         }
-
-        /* Disabling this since we adjust the shadow page table permissions in (SyncHandlerPte). */
-#if 0
-        /*
-         * Undo temporary disabling of the APIC-access page monitoring we did in hmR0VmxMergeVmcsNested.
-         * This is needed for NestedTrap0eHandler (and IEM) to cause nested-guest APIC-access VM-exits.
-         */
-        if (VmxTransient.pVmcsInfo->u32ProcCtls2 & VMX_PROC_CTLS2_VIRT_APIC_ACCESS)
-        {
-            PVMXVVMCS const pVmcsNstGst      = &pVCpu->cpum.GstCtx.hwvirt.vmx.Vmcs;
-            RTGCPHYS const  GCPhysApicAccess = pVmcsNstGst->u64AddrApicAccess.u;
-            PGMHandlerPhysicalReset(pVCpu->CTX_SUFF(pVM), GCPhysApicAccess);
-        }
-#endif
 
         /*