Changeset 28806 in vbox

Timestamp:

Apr 27, 2010 9:58:07 AM (15 years ago)

Author:

vboxsync

Message:

Page sharing updates

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• GMMR0.cpp (modified) (2 diffs)
• GMMR0Internal.h (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR0/GMMR0.cpp

@@ -483 +483 @@
     GMMCHUNKFREESET     Shared;
 
+    /** Shared module tree (global). */
+    PAVLGCPTRNODECORE   pSharedModuleTree;
+
     /** The maximum number of pages we're allowed to allocate.
      * @gcfgm   64-bit GMM/MaxPages Direct.
@@ -3327 +3330 @@
                                          unsigned cRegions, VMMDEVSHAREDREGIONDESC *pRegions)
 {
+#ifdef VBOX_WITH_PAGE_SHARING
+    /*
+     * Validate input and get the basics.
+     */
+    PGMM pGMM;
+    GMM_GET_VALID_INSTANCE(pGMM, VERR_INTERNAL_ERROR);
+    PGVM pGVM;
+    int rc = GVMMR0ByVMAndEMT(pVM, idCpu, &pGVM);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    /*
+     * Take the sempahore and do some more validations.
+     */
+    rc = RTSemFastMutexRequest(pGMM->Mtx);
+    AssertRC(rc);
+    if (GMM_CHECK_SANITY_UPON_ENTERING(pGMM))
+    {
+        /* Check if this module was already globally registered. */
+        PGMMSHAREDMODULE pRec = (PGMMSHAREDMODULE)RTAvlGCPtrGet(&pGMM->pSharedModuleTree, GCBaseAddr);
+        if (!pRec)
+        {
+            pRec = (PGMMSHAREDMODULE)RTMemAllocZ(RT_OFFSETOF(GMMSHAREDMODULE, aRegions[cRegions]));
+            pRec->Core.Key = GCBaseAddr;
+            pRec->cbModule = cbModule;
+            /* Input limit already safe; no need to check again. */
+            strcpy(pRec->szName, pszModuleName);
+            strcpy(pRec->szVersion, pszVersion);
+
+            pRec->cRegions = cRegions;
+
+            for (unsigned i = 0; i < cRegions; i++)
+                pRec->aRegions[i] = pRegions[i];
+
+            /** @todo references to pages */
+        }
+        else
+        {
+        }
+
+        GMM_CHECK_SANITY_UPON_LEAVING(pGMM);
+    }
+    else
+        rc = VERR_INTERNAL_ERROR_5;
+
+    RTSemFastMutexRelease(pGMM->Mtx);
+    return rc;
+#else
     return VERR_NOT_IMPLEMENTED;
+#endif
 }
 

trunk/src/VBox/VMM/VMMR0/GMMR0Internal.h

@@ -20 +20 @@
 
 #include <VBox/gmm.h>
+#include <iprt/avl.h>
 
 /**
@@ -38 +39 @@
 
 /**
+ * Shared module registration info
+ */
+typedef struct GMMSHAREDMODULE
+{
+    /* Tree node. */
+    AVLGCPTRNODECORE            Core;
+    /** Shared module size. */
+    uint32_t                    cbModule;
+    /** Number of included region descriptors */
+    uint32_t                    cRegions;
+    /** Module name */
+    char                        szName[GMM_SHARED_MODULE_MAX_NAME_STRING];
+    /** Module version */
+    char                        szVersion[GMM_SHARED_MODULE_MAX_VERSION_STRING];
+    /** Shared region descriptor(s). */
+    VMMDEVSHAREDREGIONDESC      aRegions[1];
+} GMMSHAREDMODULE;
+/** Pointer to a GMMMODULE. */
+typedef GMMSHAREDMODULE *PGMMSHAREDMODULE;
+
+/**
  * The per-VM GMM data.
  */
@@ -43 +65 @@
 {
     /** The reservations. */
-    GMMVMSIZES      Reserved;
+    GMMVMSIZES          Reserved;
     /** The actual allocations.
      * This includes both private and shared page allocations. */
-    GMMVMSIZES      Allocated;
+    GMMVMSIZES          Allocated;
 
     /** The current number of private pages. */
-    uint64_t        cPrivatePages;
+    uint64_t            cPrivatePages;
     /** The current number of shared pages. */
-    uint64_t        cSharedPages;
+    uint64_t            cSharedPages;
     /** The current over-comitment policy. */
-    GMMOCPOLICY     enmPolicy;
+    GMMOCPOLICY         enmPolicy;
     /** The VM priority for arbitrating VMs in low and out of memory situation.
      * Like which VMs to start sequeezing first. */
-    GMMPRIORITY     enmPriority;
+    GMMPRIORITY         enmPriority;
 
     /** The current number of ballooned pages. */
-    uint64_t        cBalloonedPages;
+    uint64_t            cBalloonedPages;
     /** The max number of pages that can be ballooned. */
-    uint64_t        cMaxBalloonedPages;
+    uint64_t            cMaxBalloonedPages;
     /** The number of pages we've currently requested the guest to give us.
      * This is 0 if no pages currently requested. */
-    uint64_t        cReqBalloonedPages;
+    uint64_t            cReqBalloonedPages;
     /** The number of pages the guest has given us in response to the request.
      * This is not reset on request completed and may be used in later decisions. */
-    uint64_t        cReqActuallyBalloonedPages;
+    uint64_t            cReqActuallyBalloonedPages;
     /** The number of pages we've currently requested the guest to take back. */
-    uint64_t        cReqDeflatePages;
+    uint64_t            cReqDeflatePages;
+
     /** Whether ballooning is enabled or not. */
-    bool            fBallooningEnabled;
+    bool                fBallooningEnabled;
+
+    /** Whether shared paging is enabled or not. */
+    bool                fSharedPagingEnabled;
 
     /** Whether the VM is allowed to allocate memory or not.
      * This is used when the reservation update request fails or when the VM has
      * been told to suspend/save/die in an out-of-memory case. */
-    bool            fMayAllocate;
+    bool                fMayAllocate;
 } GMMPERVM;
 /** Pointer to the per-VM GMM data. */