Changeset 104548 in vbox

Timestamp:

May 8, 2024 12:26:12 PM (7 months ago)

Author:

vboxsync

Message:

VMM/PGM: Some EMT asserting and spaces. bugref:10687

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAll.cpp (modified) (1 diff)
• PGMAllGst.h (modified) (9 diffs)
• PGMAllPhys.cpp (modified) (3 diffs)

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

@@ -1907 +1907 @@
  * Gets effective Guest OS page information.
  *
- * When GCPtr is in a big page, the function will return as if it was a normal
- * 4KB page. If the need for distinguishing between big and normal page becomes
- * necessary at a later point, a PGMGstGetPage() will be created for that
- * purpose.
- *
  * @returns VBox status code.
  * @param   pVCpu       The cross context virtual CPU structure of the calling EMT.
  * @param   GCPtr       Guest Context virtual address of the page.
  * @param   pWalk       Where to store the page walk information.
+ * @thread  EMT(pVCpu)
  */
 VMMDECL(int) PGMGstGetPage(PVMCPUCC pVCpu, RTGCPTR GCPtr, PPGMPTWALK pWalk)

trunk/src/VBox/VMM/VMMAll/PGMAllGst.h

@@ -128 +128 @@
     int rc;
 
-#ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
+# ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
 /** @def PGM_GST_SLAT_WALK
  * Macro to perform guest second-level address translation (EPT or Nested).
@@ -139 +139 @@
  * @param   a_GCPhysOut     Where to store the guest-physical address (result).
  */
-# define PGM_GST_SLAT_WALK(a_pVCpu, a_GCPtrNested, a_GCPhysNested, a_GCPhysOut, a_pWalk) \
+#  define PGM_GST_SLAT_WALK(a_pVCpu, a_GCPtrNested, a_GCPhysNested, a_GCPhysOut, a_pWalk) \
     do { \
         if ((a_pVCpu)->pgm.s.enmGuestSlatMode == PGMSLAT_EPT) \
@@ -156 +156 @@
         } \
     } while (0)
-#endif
+# endif
 
     /*
@@ -203 +203 @@
          */
         RTGCPHYS GCPhysPdpt = Pml4e.u & X86_PML4E_PG_MASK;
-#ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
+#  ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
         PGM_GST_SLAT_WALK(pVCpu, GCPtr, GCPhysPdpt, GCPhysPdpt, pWalk);
-#endif
+#  endif
         rc = PGM_GCPHYS_2_PTR_BY_VMCPU(pVCpu, GCPhysPdpt, &pGstWalk->pPdpt);
         if (RT_SUCCESS(rc)) { /* probable */ }
@@ -214 +214 @@
         if (RT_SUCCESS(rc)) { /* probable */ }
         else return PGM_GST_NAME(WalkReturnBadPhysAddr)(pVCpu, pWalk, 8, rc);
-#endif
+# endif
     }
     {
@@ -229 +229 @@
         else return PGM_GST_NAME(WalkReturnRsvdError)(pVCpu, pWalk, 3);
 
-# if PGM_GST_TYPE == PGM_TYPE_AMD64
+#  if PGM_GST_TYPE == PGM_TYPE_AMD64
         fEffective &= (Pdpe.u & (  X86_PDPE_P   | X86_PDPE_RW  | X86_PDPE_US
                                  | X86_PDPE_PWT | X86_PDPE_PCD | X86_PDPE_A));
         fEffective |= Pdpe.u & X86_PDPE_LM_NX;
-# else
+#  else
         /*
          * NX in the legacy-mode PAE PDPE is reserved. The valid check above ensures the NX bit is not set.
@@ -241 +241 @@
         fEffective = X86_PDPE_P | X86_PDPE_RW  | X86_PDPE_US | X86_PDPE_A
                    | (Pdpe.u & (X86_PDPE_PWT | X86_PDPE_PCD));
-# endif
+#  endif
         pWalk->fEffective = fEffective;
 
@@ -248 +248 @@
          */
         RTGCPHYS GCPhysPd = Pdpe.u & X86_PDPE_PG_MASK;
-# ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
+#  ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
         PGM_GST_SLAT_WALK(pVCpu, GCPtr, GCPhysPd, GCPhysPd, pWalk);
-# endif
+#  endif
         rc = PGM_GCPHYS_2_PTR_BY_VMCPU(pVCpu, GCPhysPd, &pGstWalk->pPd);
         if (RT_SUCCESS(rc)) { /* probable */ }
@@ -394 +394 @@
         return rc;
     }
-#  endif
+# endif
 
     /*

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

@@ -2125 +2125 @@
  * @remark  Avoid calling this API from within critical sections (other than
  *          the PGM one) because of the deadlock risk.
- * @thread  EMT
+ * @thread  EMT(pVCpu)
  */
 VMM_INT_DECL(int) PGMPhysGCPtr2CCPtrReadOnly(PVMCPUCC pVCpu, RTGCPTR GCPtr, void const **ppv, PPGMPAGEMAPLOCK pLock)
@@ -2377 +2377 @@
  * @param   GCPtr       The guest pointer to convert.
  * @param   pGCPhys     Where to store the GC physical address.
+ * @thread  EMT(pVCpu)
  */
 VMMDECL(int) PGMPhysGCPtr2GCPhys(PVMCPUCC pVCpu, RTGCPTR GCPtr, PRTGCPHYS pGCPhys)
 {
+    VM_ASSERT_EMT(pVCpu->CTX_SUFF(pVM));
     PGMPTWALK Walk;
     int rc = PGMGstGetPage(pVCpu, (RTGCUINTPTR)GCPtr, &Walk);
@@ -2397 +2399 @@
  * @param   GCPtr       The guest pointer to convert.
  * @param   pHCPhys     Where to store the HC physical address.
+ * @thread  EMT(pVCpu)
  */
 VMM_INT_DECL(int) PGMPhysGCPtr2HCPhys(PVMCPUCC pVCpu, RTGCPTR GCPtr, PRTHCPHYS pHCPhys)
 {
+    VM_ASSERT_EMT(pVCpu->CTX_SUFF(pVM));
     PVMCC     pVM = pVCpu->CTX_SUFF(pVM);
     PGMPTWALK Walk;