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

Timestamp:

Nov 12, 2021 9:47:48 AM (3 years ago)

Author:

vboxsync

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

148245

Message:

VMM/PGM,GMM: Made pgmR0PhysAllocateHandyPages & GMMR0AllocateHandyPages callable from ring-0 HM context, eliminating the need for the call-ring-3 fun. bugref:10093

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• GMMR0.cpp (modified) (3 diffs)
• VMMR0.cpp (modified) (1 diff)

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

@@ -2942 +2942 @@
 
     /*
-     * Validate, get basics and take the semaphore.
+     * Validate & get basics.
      * (This is a relatively busy path, so make predictions where possible.)
      */
@@ -2983 +2983 @@
     }
 
-    gmmR0MutexAcquire(pGMM);
-    if (GMM_CHECK_SANITY_UPON_ENTERING(pGMM))
+    /*
+     * Take the semaphore
+     */
+    VMMR0EMTBLOCKCTX Ctx;
+    PGVMCPU          pGVCpu = &pGVM->aCpus[idCpu];
+    rc = VMMR0EmtPrepareToBlock(pGVCpu, VINF_SUCCESS, "GMMR0AllocateHandyPages", pGMM, &Ctx);
+    AssertRCReturn(rc, rc);
+
+    rc = gmmR0MutexAcquire(pGMM);
+    if (   RT_SUCCESS(rc)
+        && GMM_CHECK_SANITY_UPON_ENTERING(pGMM))
     {
         /* No allocations before the initial reservation has been made! */
@@ -3105 +3114 @@
             rc = VERR_WRONG_ORDER;
         GMM_CHECK_SANITY_UPON_LEAVING(pGMM);
-    }
-    else
+        gmmR0MutexRelease(pGMM);
+    }
+    else if (RT_SUCCESS(rc))
+    {
+        gmmR0MutexRelease(pGMM);
         rc = VERR_GMM_IS_NOT_SANE;
-    gmmR0MutexRelease(pGMM);
+    }
+    VMMR0EmtResumeAfterBlocking(pGVCpu, &Ctx);
+
     LogFlow(("GMMR0AllocateHandyPages: returns %Rrc\n", rc));
     return rc;

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

@@ -1294 +1294 @@
             switch (pVCpu->vmm.s.enmCallRing3Operation)
             {
-                case VMMCALLRING3_PGM_ALLOCATE_HANDY_PAGES:
-                    STAM_COUNTER_INC(&pVM->vmm.s.StatRZCallPGMAllocHandy);
-                    break;
                 case VMMCALLRING3_VM_R0_ASSERTION:
                 default: