Changeset 99360 in vbox for trunk/src

Timestamp:

Apr 10, 2023 5:44:28 AM (22 months ago)

Author:

vboxsync

Message:

VMM/PGM: Nested VMX: bugref:10318 Skip some redundant checks while repeatedly registeration the virtual VMX APIC-access page.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllHandler.cpp (modified) (5 diffs)

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

@@ -339 +339 @@
  * @param   pVM             The cross context VM structure.
  * @param   pPhysHandler    The physical handler.
- * @param   GCPhys          The address of the virtual VMX APIC-access page.
+ * @param   GCPhys          The address of the virtual VMX APIC-access page. Must be
+ *                          page aligned.
  */
 static int pgmHandlerPhysicalRegisterVmxApicAccessPage(PVMCC pVM, PPGMPHYSHANDLER pPhysHandler, RTGCPHYS GCPhys)
@@ -454 +455 @@
  *
  * @param   pVM             The cross context VM structure.
- * @param   GCPhys          Start physical address.
+ * @param   GCPhys          The address of the VMX virtual-APIC access page. Must be
+ *                          page aligned.
  * @param   hType           The handler type registration handle.
  */
@@ -461 +463 @@
     PCPGMPHYSHANDLERTYPEINT const pType = pgmHandlerPhysicalTypeHandleToPtr(pVM, hType);
     AssertReturn(pType, VERR_INVALID_HANDLE);
-    AssertReturn(pType->enmKind == PGMPHYSHANDLERKIND_ALL, VERR_INVALID_HANDLE);
-    AssertMsgReturn(!(GCPhys & GUEST_PAGE_OFFSET_MASK), ("%RGp\n", GCPhys), VERR_INVALID_PARAMETER);
+    AssertMsg(!(GCPhys & GUEST_PAGE_OFFSET_MASK), ("%RGp\n", GCPhys));
 
     /*
      * Find if the VMX APIC access page has already been registered at this address.
      */
-    int rc = PGM_LOCK_VOID(pVM);
+    int rc = PGM_LOCK(pVM);
     AssertRCReturn(rc, rc);
 
@@ -481 +482 @@
 
         /* Check it's the virtual VMX APIC-access page. */
-        if (   pHandlerType->fNotInHm
-            && pHandlerType->enmKind == PGMPHYSHANDLERKIND_ALL)
+        if (pHandlerType->fNotInHm)
+        {
+            Assert(pHandlerType->enmKind == PGMPHYSHANDLERKIND_ALL);
             rc = VINF_SUCCESS;
+        }
         else
         {
@@ -494 +497 @@
         return rc;
     }
+
+    /*
+     * Validate the page handler parameters before registering the virtual VMX APIC-access page.
+     */
+    AssertReturn(pType->enmKind == PGMPHYSHANDLERKIND_ALL, VERR_INVALID_HANDLE);
+    AssertReturn(pType->fNotInHm, VERR_PGM_HANDLER_IPE_1);
 
     /*