Changeset 26606 in vbox for trunk/include

Timestamp:

Feb 17, 2010 12:40:42 PM (15 years ago)

Author:

vboxsync

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

57799

Message:

Large page work

Location:

trunk/include/VBox

Files:

• gmm.h (modified) (3 diffs)
• pgm.h (modified) (2 diffs)
• vmm.h (modified) (3 diffs)

trunk/include/VBox/gmm.h

@@ -271 +271 @@
 GMMR0DECL(int)  GMMR0AllocateHandyPages(PVM pVM, VMCPUID idCpu, uint32_t cPagesToUpdate, uint32_t cPagesToAlloc, PGMMPAGEDESC paPages);
 GMMR0DECL(int)  GMMR0AllocatePages(PVM pVM, VMCPUID idCpu, uint32_t cPages, PGMMPAGEDESC paPages, GMMACCOUNT enmAccount);
-GMMR0DECL(int)  GMMR0AllocateLargePage(PVM pVM, VMCPUID idCpu, uint32_t cbPage, uint32_t *pidPage, RTHCPHYS *pHCPhys);
+GMMR0DECL(int)  GMMR0AllocateLargePage(PVM pVM, VMCPUID idCpu, uint32_t cbPage, uint32_t *pIdPage, RTHCPHYS *pHCPhys);
 GMMR0DECL(int)  GMMR0FreePages(PVM pVM, VMCPUID idCpu, uint32_t cPages, PGMMFREEPAGEDESC paPages, GMMACCOUNT enmAccount);
 GMMR0DECL(int)  GMMR0FreeLargePage(PVM pVM, VMCPUID idCpu, uint32_t idPage);
@@ -404 +404 @@
 GMMR0DECL(int)  GMMR0MapUnmapChunkReq(PVM pVM, VMCPUID idCpu, PGMMMAPUNMAPCHUNKREQ pReq);
 
-/**
- * Request buffer for GMMR0AllocateLargePageReq / VMMR0_DO_GMM_ALLOC_LARGE_PAGE.
- * @see GMMR0AllocateLargePage
- */
-typedef struct GMMALLOCLARGEPAGEREQ
-{
-    /** The header. */
-    SUPVMMR0REQHDR  Hdr;
-    /* Large page size. */
-    uint32_t        cbPage;
-    /** The Page ID.
-     *
-     * @output  The ID of the page, NIL_GMM_PAGEID if the allocation failed.
-     */
-    uint32_t        idPage;
-    /* Host physical address of the large page. */
-    RTHCPHYS        HCPhys;
-} GMMALLOCLARGEPAGEREQ;
-/** Pointer to a GMMR0AllocateLargePageReq / VMMR0_DO_GMM_ALLOC_LARGE_PAGE request buffer. */
-typedef GMMALLOCLARGEPAGEREQ *PGMMALLOCLARGEPAGEREQ;
-
-GMMR0DECL(int) GMMR0AllocateLargePageReq(PVM pVM, VMCPUID idCpu, PGMMALLOCLARGEPAGEREQ pReq);
-
 
 /**
@@ -461 +438 @@
 GMMR3DECL(void) GMMR3FreePagesCleanup(PGMMFREEPAGESREQ pReq);
 GMMR3DECL(void) GMMR3FreeAllocatedPages(PVM pVM, GMMALLOCATEPAGESREQ const *pAllocReq);
-GMMR3DECL(int)  GMMR3AllocateLargePage(PVM pVM,  uint32_t cbPage, uint32_t *pidPage, RTHCPHYS *pHCPhys);
+GMMR3DECL(int)  GMMR3AllocateLargePage(PVM pVM,  uint32_t cbPage);
 GMMR3DECL(int)  GMMR3FreeLargePage(PVM pVM,  uint32_t idPage);
 GMMR3DECL(int)  GMMR3DeflatedBalloon(PVM pVM, uint32_t cPages);

trunk/include/VBox/pgm.h

@@ -420 +420 @@
  */
 VMMR0DECL(int)      PGMR0PhysAllocateHandyPages(PVM pVM, PVMCPU pVCpu);
+VMMR0DECL(int)      PGMR0PhysAllocateLargeHandyPage(PVM pVM, PVMCPU pVCpu);
 VMMR0DECL(int)      PGMR0Trap0eHandlerNestedPaging(PVM pVM, PVMCPU pVCpu, PGMMODE enmShwPagingMode, RTGCUINT uErr, PCPUMCTXCORE pRegFrame, RTGCPHYS pvFault);
 # ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
@@ -533 +534 @@
 VMMR3DECL(void)     PGMR3PhysChunkInvalidateTLB(PVM pVM);
 VMMR3DECL(int)      PGMR3PhysAllocateHandyPages(PVM pVM);
-VMMR3DECL(int)      PGMR3PhysAllocateLargePage(PVM pVM);
+VMMR3DECL(int)      PGMR3PhysAllocateLargeHandyPage(PVM pVM);
 
 VMMR3DECL(void)     PGMR3ReleaseOwnedLocks(PVM pVM);

trunk/include/VBox/vmm.h

@@ -96 +96 @@
     VMMCALLRING3_PGM_ALLOCATE_HANDY_PAGES,
     /** Allocates a large (2MB) page. */
-    VMMCALLRING3_PGM_ALLOCATE_LARGE_PAGE,
+    VMMCALLRING3_PGM_ALLOCATE_LARGE_HANDY_PAGE,
     /** Acquire the MM hypervisor heap lock. */
     VMMCALLRING3_MMHYPER_LOCK,
@@ -287 +287 @@
     /** Call PGMR0PhysAllocateHandyPages(). */
     VMMR0_DO_PGM_ALLOCATE_HANDY_PAGES,
+    /** Call PGMR0AllocateLargePage(). */
+    VMMR0_DO_PGM_ALLOCATE_LARGE_HANDY_PAGE,
 
     /** Call GMMR0InitialReservation(). */
@@ -294 +296 @@
     /** Call GMMR0AllocatePages(). */
     VMMR0_DO_GMM_ALLOCATE_PAGES,
-    /** Call GMMR0AllocateLargePage(). */
-    VMMR0_DO_GMM_ALLOC_LARGE_PAGE,
     /** Call GMMR0FreePages(). */
     VMMR0_DO_GMM_FREE_PAGES,