Changeset 40054 in vbox for trunk/include/VBox

Timestamp:

Feb 9, 2012 3:37:11 PM (13 years ago)

Author:

vboxsync

Message:

VMM,VMMDev: Page sharing cleanup.

Location:

trunk/include/VBox

Files:

• err.h (modified) (2 diffs)
• vmm/gmm.h (modified) (5 diffs)
• vmm/pgm.h (modified) (2 diffs)

trunk/include/VBox/err.h

@@ -500 +500 @@
 /** Don't mess around with ballooned pages. */
 #define VERR_PGM_PHYS_PAGE_BALLOONED            (-1646)
-/** Shared module already registered. */
-#define VINF_PGM_SHARED_MODULE_ALREADY_REGISTERED   (1647)
-/** Shared module not found. */
-#define VERR_PGM_SHARED_MODULE_NOT_FOUND        (-1648)
-/** Shared module different from previously registered module. */
-#define VINF_PGM_SHARED_MODULE_COLLISION        (1649)
-/** Inconsistent local and global registration records. */
-#define VERR_PGM_SHARED_MODULE_REGISTRATION_INCONSISTENCY (-1650)
+
+
 /** pgmPhysPageMapCommon encountered PGMPAGETYPE_MMIO2_ALIAS_MMIO. */
 #define VERR_PGM_MAP_MMIO2_ALIAS_MMIO           (-1651)
@@ -1719 +1713 @@
 /** Invalid page count given to GMMR3FreePagesPerform.  */
 #define VERR_GMM_ACTUAL_PAGES_IPE                   (-3821)
+/** The shared module name is too long. */
+#define VERR_GMM_MODULE_NAME_TOO_LONG               (-3822)
+/** The shared module version string is too long. */
+#define VERR_GMM_MODULE_VERSION_TOO_LONG            (-3823)
+/** The shared module has too many regions. */
+#define VERR_GMM_TOO_MANY_REGIONS                   (-3824)
+/** The guest has reported too many modules. */
+#define VERR_GMM_TOO_MANY_PER_VM_MODULES            (-3825)
+/** The guest has reported too many modules. */
+#define VERR_GMM_TOO_MANY_GLOBAL_MODULES            (-3826)
+/** The shared module is already registered. */
+#define VINF_GMM_SHARED_MODULE_ALREADY_REGISTERED   (3827)
+/** The shared module clashed address wise with a previously registered
+ * module. */
+#define VERR_GMM_SHARED_MODULE_ADDRESS_CLASH        (-3828)
+/** The shared module was not found. */
+#define VERR_GMM_SHARED_MODULE_NOT_FOUND            (-3829)
+/** The size of the shared module was out of range. */
+#define VERR_GMM_BAD_SHARED_MODULE_SIZE             (-3830)
+/** The size of the one or more regions in the shared module was out of
+ * range. */
+#define VERR_GMM_SHARED_MODULE_BAD_REGIONS_SIZE     (-3831)
 /** @} */
 

trunk/include/VBox/vmm/gmm.h

@@ -412 +412 @@
 GMMR0DECL(int)  GMMR0RegisterSharedModule(PVM pVM, VMCPUID idCpu, VBOXOSFAMILY enmGuestOS, char *pszModuleName, char *pszVersion,
                                           RTGCPTR GCBaseAddr,  uint32_t cbModule, uint32_t cRegions,
-                                          struct VMMDEVSHAREDREGIONDESC *pRegions);
+                                          struct VMMDEVSHAREDREGIONDESC const *paRegions);
 GMMR0DECL(int)  GMMR0UnregisterSharedModule(PVM pVM, VMCPUID idCpu, char *pszModuleName, char *pszVersion, RTGCPTR GCBaseAddr, uint32_t cbModule);
 GMMR0DECL(int)  GMMR0UnregisterAllSharedModules(PVM pVM, VMCPUID idCpu);
@@ -582 +582 @@
 GMMR0DECL(int) GMMR0FreeLargePageReq(PVM pVM, VMCPUID idCpu, PGMMFREELARGEPAGEREQ pReq);
 
-/** Maximum length of the shared module name string. */
+/** Maximum length of the shared module name string, terminator included. */
 #define GMM_SHARED_MODULE_MAX_NAME_STRING       128
-/** Maximum length of the shared module version string. */
+/** Maximum length of the shared module version string, terminator included. */
 #define GMM_SHARED_MODULE_MAX_VERSION_STRING    16
 
@@ -622 +622 @@
 typedef struct GMMSHAREDREGIONDESC
 {
-    /** Region base address. */
-    RTGCPTR64                   GCRegionAddr;
-    /** Region size. */
-    uint32_t                    cbRegion;
-    /** Alignment. */
-    uint32_t                    u32Alignment;
+    /** The page offset where the region starts. */
+    uint32_t                    off;
+    /** Region size - adjusted by the region offset and rounded up to a
+     * page. */
+    uint32_t                    cb;
     /** Pointer to physical GMM page ID array. */
     uint32_t                   *paidPages;
@@ -640 +639 @@
 typedef struct GMMSHAREDMODULE
 {
-    /** Tree node. */
-    AVLGCPTRNODECORE            Core;
+    /** Tree node (keyed by a hash of name & version). */
+    AVLLU32NODECORE             Core;
     /** Shared module size. */
     uint32_t                    cbModule;
@@ -677 +676 @@
 typedef GMMSHAREDPAGEDESC *PGMMSHAREDPAGEDESC;
 
-GMMR0DECL(int) GMMR0SharedModuleCheckPage(PGVM pGVM, PGMMSHAREDMODULE pModule, unsigned idxRegion, unsigned idxPage,
+GMMR0DECL(int) GMMR0SharedModuleCheckPage(PGVM pGVM, PGMMSHAREDMODULE pModule, uint32_t idxRegion, uint32_t idxPage,
                                           PGMMSHAREDPAGEDESC pPageDesc);
 

trunk/include/VBox/vmm/pgm.h

@@ -427 +427 @@
 VMMR0DECL(int)      PGMR0PhysAllocateLargeHandyPage(PVM pVM, PVMCPU pVCpu);
 VMMR0_INT_DECL(int) PGMR0PhysSetupIommu(PVM pVM);
-VMMR0DECL(int)      PGMR0SharedModuleCheck(PVM pVM, PGVM pGVM, VMCPUID idCpu, PGMMSHAREDMODULE pModule, uint32_t cRegions, PGMMSHAREDREGIONDESC paRegions);
+VMMR0DECL(int)      PGMR0SharedModuleCheck(PVM pVM, PGVM pGVM, VMCPUID idCpu, PGMMSHAREDMODULE pModule, PCRTGCPTR64 paRegionsGCPtrs);
 VMMR0DECL(int)      PGMR0Trap0eHandlerNestedPaging(PVM pVM, PVMCPU pVCpu, PGMMODE enmShwPagingMode, RTGCUINT uErr, PCPUMCTXCORE pRegFrame, RTGCPHYS pvFault);
 VMMR0DECL(VBOXSTRICTRC) PGMR0Trap0eHandlerNPMisconfig(PVM pVM, PVMCPU pVCpu, PGMMODE enmShwPagingMode, PCPUMCTXCORE pRegFrame, RTGCPHYS GCPhysFault, uint32_t uErr);
@@ -566 +566 @@
 /** @name Page sharing
  * @{ */
-VMMR3DECL(int)     PGMR3SharedModuleRegister(PVM pVM, VBOXOSFAMILY enmGuestOS, char *pszModuleName, char *pszVersion, RTGCPTR GCBaseAddr, uint32_t cbModule, unsigned cRegions, VMMDEVSHAREDREGIONDESC *pRegions);
-VMMR3DECL(int)     PGMR3SharedModuleUnregister(PVM pVM, char *pszModuleName, char *pszVersion, RTGCPTR GCBaseAddr, uint32_t cbModule);
+VMMR3DECL(int)     PGMR3SharedModuleRegister(PVM pVM, VBOXOSFAMILY enmGuestOS, char *pszModuleName, char *pszVersion,
+                                             RTGCPTR GCBaseAddr, uint32_t cbModule,
+                                             uint32_t cRegions, VMMDEVSHAREDREGIONDESC const *paRegions);
+VMMR3DECL(int)     PGMR3SharedModuleUnregister(PVM pVM, char *pszModuleName, char *pszVersion,
+                                               RTGCPTR GCBaseAddr, uint32_t cbModule);
 VMMR3DECL(int)     PGMR3SharedModuleCheckAll(PVM pVM);
 VMMR3DECL(int)     PGMR3SharedModuleGetPageState(PVM pVM, RTGCPTR GCPtrPage, bool *pfShared, uint64_t *pfPageFlags);