Changeset 91820 in vbox

Timestamp:

Oct 18, 2021 9:59:23 AM (3 years ago)

Author:

vboxsync

Message:

VMM/PGMPool: Make we grow while on the kernel stack. bugref:10124

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• PGMR0Pool.cpp (modified) (2 diffs)
• VMMR0StackBack-darwin.asm (modified) (1 diff)

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

@@ -140 +140 @@
 
 /**
+ * Move this back to PGMR0PoolGrow when VMM_R0_SWITCH_STACK is gonne.
+ */
+#ifndef VMM_R0_SWITCH_STACK
+static int pgmR0PoolGrowOnKrnlStk(PGVM pGVM, PGVMCPU pGVCpu, PPGMPOOL pPool)
+#else
+DECLASM(int) pgmR0PoolGrowOnKrnlStk(PGVM pGVM, PGVMCPU pGVCpu);
+DECLASM(int) StkBack_pgmR0PoolGrowOnKrnlStk(PGVM pGVM, PGVMCPU pGVCpu, PPGMPOOL pPool)
+#endif
+{
+    /*
+     * Enter the grow critical section and call worker.
+     */
+    STAM_REL_PROFILE_START(&pPool->StatGrow, a);
+
+    VMMR0EMTBLOCKCTX Ctx;
+    int rc = VMMR0EmtPrepareToBlock(pGVCpu, VINF_SUCCESS, __FUNCTION__, &pGVM->pgmr0.s.PoolGrowCritSect, &Ctx);
+    AssertRCReturn(rc, rc);
+
+    rc = RTCritSectEnter(&pGVM->pgmr0.s.PoolGrowCritSect);
+    AssertRCReturn(rc, rc);
+
+    rc = pgmR0PoolGrowInner(pGVM, pPool);
+
+    STAM_REL_PROFILE_STOP(&pPool->StatGrow, a);
+    RTCritSectLeave(&pGVM->pgmr0.s.PoolGrowCritSect);
+
+    VMMR0EmtResumeAfterBlocking(pGVCpu, &Ctx);
+    return rc;
+}
+
+
+/**
  * Grows the shadow page pool.
  *
@@ -162 +194 @@
     PGVMCPU const pGVCpu = &pGVM->aCpus[idCpu];
 
-    /*
-     * Enter the grow critical section and call worker.
-     */
-    STAM_REL_PROFILE_START(&pPool->StatGrow, a);
-
-    VMMR0EMTBLOCKCTX Ctx;
-    int rc = VMMR0EmtPrepareToBlock(pGVCpu, VINF_SUCCESS, __FUNCTION__, &pGVM->pgmr0.s.PoolGrowCritSect, &Ctx);
-    AssertRCReturn(rc, rc);
-
-    rc = RTCritSectEnter(&pGVM->pgmr0.s.PoolGrowCritSect);
-    AssertRCReturn(rc, rc);
-
-    rc = pgmR0PoolGrowInner(pGVM, pPool);
-
-    STAM_REL_PROFILE_STOP(&pPool->StatGrow, a);
-    RTCritSectLeave(&pGVM->pgmr0.s.PoolGrowCritSect);
-
-    VMMR0EmtResumeAfterBlocking(pGVCpu, &Ctx);
-
-    return rc;
+    return pgmR0PoolGrowOnKrnlStk(pGVM, pGVCpu, pPool);
 }
 

trunk/src/VBox/VMM/VMMR0/VMMR0StackBack-darwin.asm

@@ -31 +31 @@
 SUPR0StackWrapperGeneric pdmCritSectRwEnterExcl, 6
 SUPR0StackWrapperGeneric pdmCritSectRwLeaveExclWorker, 6
+SUPR0StackWrapperGeneric pgmR0PoolGrowOnKrnlStk, 3