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

Timestamp:

May 3, 2010 1:09:44 PM (15 years ago)

Author:

vboxsync

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

60991

Message:

Dump GMM stats on PGMR3PhysAllocateHandyPages failure.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• GMMR0.cpp (modified) (6 diffs)
• VMMR0.cpp (modified) (1 diff)

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

@@ -2991 +2991 @@
 
 /**
- * Return the total amount of free pages
+ * Return memory statistics for the hypervisor
  *
  * @returns VBox status code:
@@ -2997 +2997 @@
  * @param   pReq            The request packet.
  */
-GMMR0DECL(int) GMMR0QueryVMMMemoryStatsReq(PVM pVM, PGMMMEMSTATSREQ pReq)
+GMMR0DECL(int) GMMR0QueryHypervisorMemoryStatsReq(PVM pVM, PGMMMEMSTATSREQ pReq)
 {
     /*
@@ -3016 +3016 @@
     pReq->cFreePages      = (pGMM->cChunks << (GMM_CHUNK_SHIFT- PAGE_SHIFT)) - pGMM->cAllocatedPages;
     pReq->cBalloonedPages = pGMM->cBalloonedPages;
+    pReq->cMaxPages       = pGMM->cMaxPages;
     GMM_CHECK_SANITY_UPON_LEAVING(pGMM);
 
     return VINF_SUCCESS;
+}
+
+/**
+ * Return memory statistics for the VM
+ *
+ * @returns VBox status code:
+ * @param   pVM             Pointer to the shared VM structure.
+ * @parma   idCpu           Cpu id.
+ * @param   pReq            The request packet.
+ */
+GMMR0DECL(int)  GMMR0QueryMemoryStatsReq(PVM pVM, VMCPUID idCpu, PGMMMEMSTATSREQ pReq)
+{
+    /*
+     * Validate input and pass it on.
+     */
+    AssertPtrReturn(pVM, VERR_INVALID_POINTER);
+    AssertPtrReturn(pReq, VERR_INVALID_POINTER);
+    AssertMsgReturn(pReq->Hdr.cbReq == sizeof(GMMMEMSTATSREQ),
+                    ("%#x < %#x\n", pReq->Hdr.cbReq, sizeof(GMMMEMSTATSREQ)),
+                    VERR_INVALID_PARAMETER);
+
+    /*
+     * 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))
+    {
+        pReq->cAllocPages     = pGVM->gmm.s.Allocated.cBasePages;
+        pReq->cBalloonedPages = pGVM->gmm.s.cBalloonedPages;
+        pReq->cMaxPages       = pGVM->gmm.s.Reserved.cBasePages;
+        pReq->cFreePages      = pReq->cMaxPages - pReq->cAllocPages;
+    }
+    else
+        rc = VERR_INTERNAL_ERROR_5;
+
+    RTSemFastMutexRelease(pGMM->Mtx);
+    LogFlow(("GMMR3QueryVMMemoryStats: returns %Rrc\n", rc));
+    return rc;
 }
 
@@ -3416 +3466 @@
 GMMR0DECL(int) GMMR0UnregisterSharedModule(PVM pVM, VMCPUID idCpu, char *pszModuleName, char *pszVersion, RTGCPTR GCBaseAddr, uint32_t cbModule)
 {
+#ifdef VBOX_WITH_PAGE_SHARING
     return VERR_NOT_IMPLEMENTED;
+#else
+    return VERR_NOT_IMPLEMENTED;
+#endif
 }
 
@@ -3441 +3495 @@
 
 /**
- * Checks regsitered modules for shared pages
+ * Checks registered modules for shared pages
  *
  * @returns VBox status code.
@@ -3449 +3503 @@
 GMMR0DECL(int) GMMR0CheckSharedModules(PVM pVM, VMCPUID idCpu)
 {
+#ifdef VBOX_WITH_PAGE_SHARING
     return VERR_NOT_IMPLEMENTED;
-}
+#else
+    return VERR_NOT_IMPLEMENTED;
+#endif
+}

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

@@ -905 +905 @@
             return GMMR0FreeLargePageReq(pVM, idCpu, (PGMMFREELARGEPAGEREQ)pReqHdr);
 
-        case VMMR0_DO_GMM_QUERY_VMM_MEM_STATS:
+        case VMMR0_DO_GMM_QUERY_HYPERVISOR_MEM_STATS:
             if (u64Arg)
                 return VERR_INVALID_PARAMETER;
-            return GMMR0QueryVMMMemoryStatsReq(pVM, (PGMMMEMSTATSREQ)pReqHdr);
+            return GMMR0QueryHypervisorMemoryStatsReq(pVM, (PGMMMEMSTATSREQ)pReqHdr);
+
+        case VMMR0_DO_GMM_QUERY_MEM_STATS:
+            if (idCpu == NIL_VMCPUID)
+                return VERR_INVALID_CPU_ID;
+            if (u64Arg)
+                return VERR_INVALID_PARAMETER;
+            return GMMR0QueryMemoryStatsReq(pVM, idCpu, (PGMMMEMSTATSREQ)pReqHdr);
 
         case VMMR0_DO_GMM_BALLOONED_PAGES: