Changeset 20862 in vbox

Timestamp:

Jun 23, 2009 6:25:31 PM (15 years ago)

Author:

vboxsync

Message:

SUP: Made SUPPageLock and SUPPageUnlock internal to SUP.

Location:

trunk

Files:

• include/VBox/sup.h (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPLib.cpp (modified) (5 diffs)
• src/VBox/HostDrivers/Support/SUPLibInternal.h (modified) (1 diff)
• src/VBox/HostDrivers/Support/testcase/tstPin.cpp (modified) (6 diffs)
• src/VBox/Runtime/VBox/VBoxRTDeps.cpp (modified) (1 diff)
• src/VBox/VMM/testcase/tstCFGM.cpp (modified) (1 diff)

trunk/include/VBox/sup.h

@@ -697 +697 @@
 
 /**
- * Locks down the physical memory backing a virtual memory
- * range in the current process.
- *
- * @returns VBox status code.
- * @param   pvStart         Start of virtual memory range.
- *                          Must be page aligned.
- * @param   cPages          Number of pages.
- * @param   paPages         Where to store the physical page addresses returned.
- *                          On entry this will point to an array of with cbMemory >> PAGE_SHIFT entries.
- */
-SUPR3DECL(int) SUPPageLock(void *pvStart, size_t cPages, PSUPPAGE paPages);
-
-/**
- * Releases locked down pages.
- *
- * @returns VBox status code.
- * @param   pvStart         Start of virtual memory range previously locked
- *                          down by SUPPageLock().
- */
-SUPR3DECL(int) SUPPageUnlock(void *pvStart);
-
-/**
  * Allocate non-zeroed, locked, pages with user and, optionally, kernel
  * mappings.

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -865 +865 @@
 
 
-SUPR3DECL(int) SUPPageLock(void *pvStart, size_t cPages, PSUPPAGE paPages)
+/**
+ * Locks down the physical memory backing a virtual memory
+ * range in the current process.
+ *
+ * @returns VBox status code.
+ * @param   pvStart         Start of virtual memory range.
+ *                          Must be page aligned.
+ * @param   cPages          Number of pages.
+ * @param   paPages         Where to store the physical page addresses returned.
+ *                          On entry this will point to an array of with cbMemory >> PAGE_SHIFT entries.
+ */
+int supR3PageLock(void *pvStart, size_t cPages, PSUPPAGE paPages)
 {
     /*
@@ -920 +931 @@
 
 
-SUPR3DECL(int) SUPPageUnlock(void *pvStart)
+/**
+ * Releases locked down pages.
+ *
+ * @returns VBox status code.
+ * @param   pvStart         Start of virtual memory range previously locked
+ *                          down by SUPPageLock().
+ */
+int supR3PageUnlock(void *pvStart)
 {
     /*
@@ -974 +992 @@
     {
         /* fallback */
-        rc = SUPPageUnlock(pvPages);
+        rc = supR3PageUnlock(pvPages);
         if (RT_SUCCESS(rc))
             rc = suplibOsPageFree(&g_supLibData, pvPages, cPages);
@@ -992 +1010 @@
         if (!paPages)
             paPages = (PSUPPAGE)alloca(sizeof(paPages[0]) * cPages);
-        rc = SUPPageLock(*ppvPages, cPages, paPages);
+        rc = supR3PageLock(*ppvPages, cPages, paPages);
         if (RT_FAILURE(rc))
             suplibOsPageFree(&g_supLibData, *ppvPages, cPages);
@@ -1207 +1225 @@
             &&  !g_fSupportsPageAllocNoKernel)
         {
-            int rc2 = SUPPageUnlock(pvPages);
+            int rc2 = supR3PageUnlock(pvPages);
             if (RT_SUCCESS(rc2))
                 rc = suplibOsPageFree(&g_supLibData, pvPages, cPages);

trunk/src/VBox/HostDrivers/Support/SUPLibInternal.h

@@ -315 +315 @@
 
 
+int                supR3PageLock(void *pvStart, size_t cPages, PSUPPAGE paPages);
+int                supR3PageUnlock(void *pvStart);
+
 RT_C_DECLS_END
 

trunk/src/VBox/HostDrivers/Support/testcase/tstPin.cpp

@@ -42 +42 @@
 #include <iprt/string.h>
 
+#include "../SUPLibInternal.h"
+
 
 int main(int argc, char **argv)
@@ -63 +65 @@
         RTPrintf("pv=%p\n", pv);
         SUPPAGE aPages[1];
-        rc = SUPPageLock(pv, 1, &aPages[0]);
+        rc = supR3PageLock(pv, 1, &aPages[0]);
         RTPrintf("rc=%d aPages[0]=%RHp\n", rc, pv, aPages[0]);
         RTThreadSleep(1500);
@@ -88 +90 @@
             SUPPageAlloc(0x10000 >> PAGE_SHIFT, &aPinnings[i].pv);
             aPinnings[i].pvAligned = RT_ALIGN_P(aPinnings[i].pv, PAGE_SIZE);
-            rc = SUPPageLock(aPinnings[i].pvAligned, 0xf000 >> PAGE_SHIFT, &aPinnings[i].aPages[0]);
+            rc = supR3PageLock(aPinnings[i].pvAligned, 0xf000 >> PAGE_SHIFT, &aPinnings[i].aPages[0]);
             if (!rc)
             {
@@ -116 +118 @@
             if (aPinnings[i].pvAligned)
             {
-                rc = SUPPageUnlock(aPinnings[i].pvAligned);
+                rc = supR3PageUnlock(aPinnings[i].pvAligned);
                 if (rc)
                 {
@@ -177 +179 @@
             static SUPPAGE      aPages[BIG_SIZE >> PAGE_SHIFT];
             void *pvAligned = RT_ALIGN_P(pv, PAGE_SIZE);
-            rc = SUPPageLock(pvAligned, BIG_SIZE >> PAGE_SHIFT, &aPages[0]);
+            rc = supR3PageLock(pvAligned, BIG_SIZE >> PAGE_SHIFT, &aPages[0]);
             if (!rc)
             {
@@ -189 +191 @@
 
                 /* unlock */
-                rc = SUPPageUnlock(pvAligned);
+                rc = supR3PageUnlock(pvAligned);
                 if (rc)
                 {

trunk/src/VBox/Runtime/VBox/VBoxRTDeps.cpp

@@ -53 +53 @@
 {
     (PFNRT)SUPR3Init,
-    (PFNRT)SUPPageLock,
+    (PFNRT)SUPR3PageAllocEx,
     (PFNRT)SUPSemEventCreate,
 #ifdef VBOX_WITH_LIBXML2_IN_VBOXRT

trunk/src/VBox/VMM/testcase/tstCFGM.cpp

@@ -51 +51 @@
     int rc = SUPR3Init(NULL);
     if (RT_SUCCESS(rc))
-        rc = SUPPageAlloc(RT_ALIGN_Z(sizeof(*pVM), PAGE_SIZE) >> PAGE_SHIFT, (void **)&pVM);
+        rc = RTMemPageAlloc(RT_ALIGN_Z(sizeof(*pVM), PAGE_SIZE) >> PAGE_SHIFT, (void **)&pVM);
     if (RT_FAILURE(rc))
     {