Changeset 19262 in vbox for trunk/src/VBox

Timestamp:

Apr 29, 2009 1:00:14 PM (16 years ago)

Author:

vboxsync

Message:

Introduced PDMCritSectIsOwnerEx.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PDMAllCritSect.cpp (modified) (1 diff)
• VMMR0/PGMR0.cpp (modified) (1 diff)
• VMMR0/VMMR0.cpp (modified) (2 diffs)

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

@@ -228 +228 @@
 }
 
+/**
+ * Checks the specified VCPU is the owner of the critical section.
+ *
+ * @returns true if owner.
+ * @returns false if not owner.
+ * @param   pCritSect   The critical section.
+ * @param   idCpu       VCPU id
+ */
+VMMDECL(bool) PDMCritSectIsOwnerEx(PCPDMCRITSECT pCritSect, VMCPUID idCpu)
+{
+#ifdef IN_RING3
+    NOREF(idCpu);
+    return RTCritSectIsOwner(&pCritSect->s.Core);
+#else
+    PVM pVM = pCritSect->s.CTX_SUFF(pVM);
+    Assert(pVM);
+    Assert(idCpu < pVM->cCPUs);
+    return pCritSect->s.Core.NativeThreadOwner == pVM->aCpus[idCpu].hNativeThread;
+#endif
+}
+
 
 /**

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

@@ -59 +59 @@
  *
  * @param   pVM         The VM handle.
+ * @param   pVCpu       The VMCPU handle.
  *
  * @remarks Must be called from within the PGM critical section. The caller
  *          must clear the new pages.
  */
-VMMR0DECL(int) PGMR0PhysAllocateHandyPages(PVM pVM)
+VMMR0DECL(int) PGMR0PhysAllocateHandyPages(PVM pVM, PVMCPU pVCpu)
 {
-    Assert(PDMCritSectIsOwner(&pVM->pgm.s.CritSect));
+    Assert(PDMCritSectIsOwnerEx(&pVM->pgm.s.CritSect, pVCpu->idCpu));
 
     /*

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

@@ -720 +720 @@
             return VERR_INVALID_POINTER;
         }
+
+        if (RT_UNLIKELY(idCpu >= pVM->cCPUs))
+        {
+            SUPR0Printf("vmmR0EntryExWorker: Invalid idCpu (%d vs cCPUs=%d\n", idCpu, pVM->cCPUs);
+            return VERR_INVALID_PARAMETER;
+        }
     }
 
@@ -831 +837 @@
          */
         case VMMR0_DO_PGM_ALLOCATE_HANDY_PAGES:
-            return PGMR0PhysAllocateHandyPages(pVM);
+            return PGMR0PhysAllocateHandyPages(pVM, &pVM->aCpus[idCpu]);
 
         /*