Changeset 107194 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Nov 29, 2024 2:47:06 PM (4 months ago)

Author:

vboxsync

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

166196

Message:

VMM: More adjustments for VBOX_WITH_ONLY_PGM_NEM_MODE, VBOX_WITH_MINIMAL_R0, VBOX_WITH_HWVIRT and such. jiraref:VBP-1466

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp (modified) (15 diffs)

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

@@ -2065 +2065 @@
 }
 
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
 
 /**
@@ -2087 +2088 @@
      * Do we need to do anything special?
      */
-#ifdef IN_RING3
+# ifdef IN_RING3
     if (pVM->pgm.s.cHandyPages <= RT_MAX(PGM_HANDY_PAGES_SET_FF, PGM_HANDY_PAGES_R3_ALLOC))
-#else
+# else
     if (pVM->pgm.s.cHandyPages <= RT_MAX(PGM_HANDY_PAGES_SET_FF, PGM_HANDY_PAGES_RZ_TO_R3))
-#endif
+# endif
     {
         /*
          * Allocate pages only if we're out of them, or in ring-3, almost out.
          */
-#ifdef IN_RING3
+# ifdef IN_RING3
         if (pVM->pgm.s.cHandyPages <= PGM_HANDY_PAGES_R3_ALLOC)
-#else
+# else
         if (pVM->pgm.s.cHandyPages <= PGM_HANDY_PAGES_RZ_ALLOC)
-#endif
+# endif
         {
             Log(("PGM: cHandyPages=%u out of %u -> allocate more; VM_FF_PGM_NO_MEMORY=%RTbool\n",
                  pVM->pgm.s.cHandyPages, RT_ELEMENTS(pVM->pgm.s.aHandyPages), VM_FF_IS_SET(pVM, VM_FF_PGM_NO_MEMORY) ));
-#ifdef IN_RING3
+# ifdef IN_RING3
             int rc = PGMR3PhysAllocateHandyPages(pVM);
-#else
+# else
             int rc = pgmR0PhysAllocateHandyPages(pVM, VMMGetCpuId(pVM), false /*fRing3*/);
-#endif
+# endif
             if (RT_UNLIKELY(rc != VINF_SUCCESS))
             {
@@ -2121 +2122 @@
                 Assert(VM_FF_IS_SET(pVM, VM_FF_PGM_NEED_HANDY_PAGES));
                 Assert(VM_FF_IS_SET(pVM, VM_FF_PGM_NO_MEMORY));
-#ifndef IN_RING3
+# ifndef IN_RING3
                 VMCPU_FF_SET(VMMGetCpu(pVM), VMCPU_FF_TO_R3); /* paranoia */
-#endif
+# endif
             }
             AssertMsgReturn(    pVM->pgm.s.cHandyPages > 0
@@ -2134 +2135 @@
             if (pVM->pgm.s.cHandyPages <= PGM_HANDY_PAGES_SET_FF)
                 VM_FF_SET(pVM, VM_FF_PGM_NEED_HANDY_PAGES);
-#ifndef IN_RING3
+# ifndef IN_RING3
             if (pVM->pgm.s.cHandyPages <= PGM_HANDY_PAGES_RZ_TO_R3)
             {
@@ -2140 +2141 @@
                 VMCPU_FF_SET(VMMGetCpu(pVM), VMCPU_FF_TO_R3);
             }
-#endif
+# endif
         }
     }
@@ -2331 +2332 @@
 }
 
-#ifdef PGM_WITH_LARGE_PAGES
+# ifdef PGM_WITH_LARGE_PAGES
 
 /**
@@ -2408 +2409 @@
              * Do the allocation.
              */
-# ifdef IN_RING3
+#  ifdef IN_RING3
             rc = VMMR3CallR0(pVM, VMMR0_DO_PGM_ALLOCATE_LARGE_PAGE, GCPhysBase, NULL);
-# elif defined(IN_RING0)
+#  elif defined(IN_RING0)
             rc = pgmR0PhysAllocateLargePage(pVM, VMMGetCpuId(pVM), GCPhysBase);
-# else
-#  error "Port me"
-# endif
+#  else
+#   error "Port me"
+#  endif
             if (RT_SUCCESS(rc))
             {
@@ -2496 +2497 @@
 }
 
-#endif /* PGM_WITH_LARGE_PAGES */
+# endif /* PGM_WITH_LARGE_PAGES */
+#endif /* !VBOX_WITH_ONLY_PGM_NEM_MODE */
+
 
 
@@ -2585 +2588 @@
             RT_FALL_THRU();
         case PGM_PAGE_STATE_SHARED:
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
             return pgmPhysAllocPage(pVM, pPage, GCPhys);
+#else
+            AssertFailed(); /** @todo not sure if we make use of ZERO pages or not in NEM-mode, but I can't see how pgmPhysAllocPage would work. */
+            return VERR_PGM_NOT_SUPPORTED_FOR_NEM_MODE;
+#endif
 
         /* Not allowed to write to ballooned pages. */
@@ -2593 +2601 @@
 }
 
-
+#if 0 /* unused */
 /**
  * Internal usage: Map the page specified by its GMM ID.
@@ -2665 +2673 @@
 #endif
 }
-
+#endif /* unused */
 
 /**
@@ -3078 +3086 @@
         AssertMsg(rc == VINF_SUCCESS || rc == VINF_PGM_SYNC_CR3 /* not returned */, ("%Rrc\n", rc));
     }
-    Assert(PGM_PAGE_GET_HCPHYS(pPage) != 0);
+    Assert(PGM_PAGE_GET_HCPHYS(pPage) != 0 || PGM_IS_IN_NEM_MODE(pVM));
 
     /*
@@ -3213 +3221 @@
         AssertMsg(rc == VINF_SUCCESS || rc == VINF_PGM_SYNC_CR3 /* not returned */, ("%Rrc\n", rc));
     }
-    Assert(PGM_PAGE_GET_HCPHYS(pPage) != 0);
+    Assert(PGM_PAGE_GET_HCPHYS(pPage) != 0 || PGM_IS_IN_NEM_MODE(pVM));
 
     /*
@@ -3250 +3258 @@
     AssertReturn(pPage, VERR_PGM_PHYS_NULL_PAGE_PARAM);
     PGM_LOCK_ASSERT_OWNER(pVM);
-    Assert(PGM_PAGE_GET_HCPHYS(pPage) != 0);
+    Assert(PGM_PAGE_GET_HCPHYS(pPage) != 0 || PGM_IS_IN_NEM_MODE(pVM));
 
     /*
@@ -3736 +3744 @@
             AssertMsg(rc == VINF_SUCCESS || rc == VINF_PGM_SYNC_CR3 /* not returned */, ("%Rrc\n", rc));
         }
-        Assert(PGM_PAGE_GET_HCPHYS(pPage) != 0);
+        Assert(PGM_PAGE_GET_HCPHYS(pPage) != 0 || PGM_IS_IN_NEM_MODE(pVM));
 
         /*