Changeset 20788 in vbox

Timestamp:

Jun 22, 2009 3:26:40 PM (16 years ago)

Author:

vboxsync

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

48908

Message:

Do not call REMNotifyHandlerPhysicalModify under the PGM lock

File:

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

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

@@ -541 +541 @@
                 if (RTAvlroGCPhysInsert(&pVM->pgm.s.CTX_SUFF(pTrees)->PhysHandlers, &pCur->Core))
                 {
+                    PGMPHYSHANDLERTYPE  enmType = pCur->enmType;
+                    RTGCPHYS            GCPhysLast = pCur->Core.KeyLast - GCPhys + 1;
+                    bool                fHasHCHandler = !!pCur->pfnHandlerR3;
+
                     /*
                      * Set ram flags, flush shadow PT entries and finally tell REM about this.
@@ -546 +550 @@
                     rc = pgmHandlerPhysicalSetRamFlagsAndFlushShadowPTs(pVM, pCur, pRam);
                     pVM->pgm.s.fPhysCacheFlushPending = true;
+                    pgmUnlock(pVM);
 
 #ifndef IN_RING3
-                    REMNotifyHandlerPhysicalModify(pVM, pCur->enmType, GCPhysCurrent, GCPhys,
-                                                   pCur->Core.KeyLast - GCPhys + 1, !!pCur->pfnHandlerR3, fRestoreAsRAM);
+                    REMNotifyHandlerPhysicalModify(pVM, enmType, GCPhysCurrent, GCPhys,
+                                                   GCPhysLast - GCPhys + 1, fHasHCHandler, fRestoreAsRAM);
 #else
-                    REMR3NotifyHandlerPhysicalModify(pVM, pCur->enmType, GCPhysCurrent, GCPhys,
-                                                     pCur->Core.KeyLast - GCPhys + 1, !!pCur->pfnHandlerR3, fRestoreAsRAM);
+                    REMR3NotifyHandlerPhysicalModify(pVM, enmType, GCPhysCurrent, GCPhys,
+                                                     GCPhysLast, fHasHCHandler, fRestoreAsRAM);
 #endif
-                    pgmUnlock(pVM);
                     HWACCMFlushTLBOnAllVCpus(pVM);
                     Log(("PGMHandlerPhysicalModify: GCPhysCurrent=%RGp -> GCPhys=%RGp GCPhysLast=%RGp\n",