Changeset 28986 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

May 3, 2010 3:55:30 PM (15 years ago)

Author:

vboxsync

Message:

Updates

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• GMMR0.cpp (modified) (4 diffs)
• GMMR0Internal.h (modified) (4 diffs)

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

@@ -484 +484 @@
 
     /** Shared module tree (global). */
-    PAVLGCPTRNODECORE   pSharedModuleTree;
+    PAVLGCPTRNODECORE   pGlobalSharedModuleTree;
 
     /** The maximum number of pages we're allowed to allocate.
@@ -3398 +3398 @@
     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 */
+        /* Check if this module is already locally registered. */
+        PGMMSHAREDMODULEPERVM pRecVM = (PGMMSHAREDMODULEPERVM)RTAvlGCPtrGet(&pGVM->gmm.s.pSharedModuleTree, GCBaseAddr);
+        if (!pRecVM)
+        {
+            pRecVM = (PGMMSHAREDMODULEPERVM)RTMemAllocZ(sizeof(*pRecVM));
+            if (!pRecVM)
+            {
+                AssertFailed();
+                rc = VERR_NO_MEMORY;
+                goto end;
+            }
+
+            pRecVM->Core.Key = GCBaseAddr;
+
+            bool ret = RTAvlGCPtrInsert(&pGVM->gmm.s.pSharedModuleTree, &pRecVM->Core);
+            Assert(ret);
+
+            /* Check if this module is already globally registered. */
+            PGMMSHAREDMODULE pRec = (PGMMSHAREDMODULE)RTAvlGCPtrGet(&pGMM->pGlobalSharedModuleTree, GCBaseAddr);
+            if (!pRec)
+            {
+                pRec = (PGMMSHAREDMODULE)RTMemAllocZ(RT_OFFSETOF(GMMSHAREDMODULE, aRegions[cRegions]));
+                if (!pRec)
+                {
+                    AssertFailed();
+                    rc = VERR_NO_MEMORY;
+                    goto end;
+                }
+
+                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];
+
+                /* Save reference. */
+                pRecVM->pSharedModule = pRec;
+            }
+            else
+            {
+                Assert(pRecVM->pSharedModule == pRec);
+                Assert(pRec->cUsers > 0);
+            }
+            pRec->cUsers++;
         }
         else
-        {
-        }
+            rc = VINF_PGM_SHARED_MODULE_ALREADY_REGISTERED;
 
         GMM_CHECK_SANITY_UPON_LEAVING(pGMM);
@@ -3425 +3456 @@
         rc = VERR_INTERNAL_ERROR_5;
 
+end:
     RTSemFastMutexRelease(pGMM->Mtx);
     return rc;
@@ -3467 +3499 @@
 {
 #ifdef VBOX_WITH_PAGE_SHARING
-    return VERR_NOT_IMPLEMENTED;
+    /*
+     * 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))
+    {
+        PGMMSHAREDMODULEPERVM pRecVM = (PGMMSHAREDMODULEPERVM)RTAvlGCPtrGet(&pGVM->gmm.s.pSharedModuleTree, GCBaseAddr);
+        if (!pRecVM)
+        {
+            rc = VERR_PGM_SHARED_MODULE_NOT_FOUND;
+            goto end;
+        }
+        PGMMSHAREDMODULE pRec = pRecVM->pSharedModule;
+        Assert(pRec);
+        Assert(pRec->cUsers);
+
+        pRec->cUsers--;
+        if (pRec->cUsers == 0)
+        {
+            /* @todo free shared pages. */
+            RTMemFree(pRec);
+        }
+        RTMemFree(pRecVM);
+
+        GMM_CHECK_SANITY_UPON_LEAVING(pGMM);
+    }
+    else
+        rc = VERR_INTERNAL_ERROR_5;
+
+end:
+    RTSemFastMutexRelease(pGMM->Mtx);
+    return rc;
 #else
     return VERR_NOT_IMPLEMENTED;

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

@@ -39 +39 @@
 
 /**
- * Shared module registration info
+ * Shared module registration info (global)
  */
 typedef struct GMMSHAREDMODULE
@@ -49 +49 @@
     /** Number of included region descriptors */
     uint32_t                    cRegions;
+    /** Number of users (VMs). */
+    uint32_t                    cUsers;
+    /** Align. */
+    uint32_t                    u32Align;
     /** Module name */
     char                        szName[GMM_SHARED_MODULE_MAX_NAME_STRING];
@@ -56 +60 @@
     VMMDEVSHAREDREGIONDESC      aRegions[1];
 } GMMSHAREDMODULE;
-/** Pointer to a GMMMODULE. */
+/** Pointer to a GMMSHAREDMODULE. */
 typedef GMMSHAREDMODULE *PGMMSHAREDMODULE;
+
+/**
+ * Shared module registration info (per VM)
+ */
+typedef struct GMMSHAREDMODULEPERVM
+{
+    /* Tree node. */
+    AVLGCPTRNODECORE            Core;
+
+    /* Pointer to global shared module info. */
+    PGMMSHAREDMODULE            pSharedModule;
+
+} GMMSHAREDMODULEPERVM;
+/** Pointer to a GMMSHAREDMODULEPERVM. */
+typedef GMMSHAREDMODULEPERVM *PGMMSHAREDMODULEPERVM;
 
 /**
@@ -93 +112 @@
     uint64_t            cReqDeflatePages;
 
+    /** Shared module tree (per-vm). */
+    PAVLGCPTRNODECORE   pSharedModuleTree;
+
     /** Whether ballooning is enabled or not. */
     bool                fBallooningEnabled;