Changeset 5240 in vbox for trunk

Timestamp:

Oct 11, 2007 3:57:00 PM (17 years ago)

Author:

vboxsync

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

25193

Message:

GCFGM mock-up.

Location:

trunk

Files:

• include/VBox/gvmm.h (modified) (1 diff)
• include/VBox/vmm.h (modified) (2 diffs)
• src/VBox/VMM/VMMR0/GVMMR0.cpp (modified) (6 diffs)
• src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (1 diff)
• src/VBox/VMM/testcase/Makefile.kmk (modified) (2 diffs)
• src/VBox/VMM/testcase/tstGlobalConfig.cpp (copied) (copied from trunk/src/VBox/VMM/testcase/tstVMM.cpp ) (2 diffs)

trunk/include/VBox/gvmm.h

@@ -107 +107 @@
 GVMMR0DECL(int)     GVMMR0Init(void);
 GVMMR0DECL(void)    GVMMR0Term(void);
+GVMMR0DECL(int)     GVMMR0SetConfig(PSUPDRVSESSION pSession, const char *pszName, uint64_t u64Value);
+GVMMR0DECL(int)     GVMMR0QueryConfig(PSUPDRVSESSION pSession, const char *pszName, uint64_t *pu64Value);
 
 GVMMR0DECL(int)     GVMMR0CreateVM(PSUPDRVSESSION pSession, PVM *ppVM);

trunk/include/VBox/vmm.h

@@ -404 +404 @@
     VMMR0_DO_GMM_SEED_CHUNK,
 
-    /** Gets the GMM and GVMM stats. */
-    VMMR0_DO_GET_GXX_STATS,
+    /** Set a GVMM or GMM configuration value. */
+    VMMR0_DO_GCFGM_SET_VALUE,
+    /** Query a GVMM or GMM configuration value. */
+    VMMR0_DO_GCFGM_QUERY_VALUE,
 
     /** The start of the R0 service operations. */
@@ -431 +433 @@
 } VMMR0OPERATION;
 
+
+/**
+ * Request buffer for VMMR0_DO_GCFGM_SET_VALUE and VMMR0_DO_GCFGM_QUERY_VALUE.
+ * @todo Move got GCFGM.h when it's implemented.
+ */
+typedef struct GCFGMVALUEREQ
+{
+    /** The request header.*/
+    SUPVMMR0REQHDR      Hdr;
+    /** The support driver session handle. */
+    PSUPDRVSESSION      pSession;
+    /** The value.
+     * This is input for the set request and output for the query. */
+    uint64_t            u64Value;
+    /** The variable name.
+     * This is fixed sized just to make things simple for the mock-up. */
+    char                szName[48];
+} GCFGMVALUEREQ;
+/** Pointer to a VMMR0_DO_GCFGM_SET_VALUE and VMMR0_DO_GCFGM_QUERY_VALUE request buffer.
+ * @todo Move got GCFGM.h when it's implemented.
+ */
+typedef GCFGMVALUEREQ *PGCFGMVALUEREQ;
+
+
 /**
  * The Ring 0 entry point, called by the interrupt gate.

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

@@ -107 +107 @@
      * The first entry is unused as it represents the NIL handle. */
     GVMHANDLE           aHandles[128];
+
+    /** The minimum sleep time, in nano seconds.
+     * @gcfgm   /GVMM/MinSleep      32-bit  0..100000000
+     */
+    uint32_t            nsMinSleep;
+    /** The limit for the first round of early wakeups, given in nano seconds.
+     * @gcfgm   /GVMM/EarlyWakeUp1  32-bit  0..100000000
+     */
+    uint32_t            nsEarlyWakeUp1;
+    /** The limit for the second round of early wakeups, given in nano seconds.
+     * @gcfgm   /GVMM/EarlyWakeUp2  32-bit  0..100000000
+     */
+    uint32_t            nsEarlyWakeUp2;
 } GVMM;
 /** Pointer to the GVMM instance data. */
@@ -202 +215 @@
             }
 
+            /* The default configuration values. */
+            pGVMM->nsMinSleep     = 750000 /* ns (0.750 ms) */; /** @todo this should be adjusted to be 75% (or something) of the scheduler granularity... */
+            pGVMM->nsEarlyWakeUp1 =  25000 /* ns (0.025 ms) */;
+            pGVMM->nsEarlyWakeUp2 =  50000 /* ns (0.050 ms) */;
+
             g_pGVMM = pGVMM;
             LogFlow(("GVMMR0Init: pGVMM=%p\n", pGVMM));
@@ -249 +267 @@
 
     RTMemFree(pGVMM);
+}
+
+
+/**
+ * A quick hack for setting global config values.
+ *
+ * @returns VBox status code.
+ *
+ * @param   pSession    The session handle. Used for authentication.
+ * @param   pszName     The variable name.
+ * @param   u64Value    The new value.
+ */
+GVMMR0DECL(int) GVMMR0SetConfig(PSUPDRVSESSION pSession, const char *pszName, uint64_t u64Value)
+{
+    /*
+     * Validate input.
+     */
+    PGVMM pGVMM;
+    GVMM_GET_VALID_INSTANCE(pGVMM, VERR_INTERNAL_ERROR);
+    AssertPtrReturn(pSession, VERR_INVALID_HANDLE);
+    AssertPtrReturn(pszName, VERR_INVALID_POINTER);
+
+    /*
+     * String switch time!
+     */
+    if (strncmp(pszName, "/GVMM/", sizeof("/GVMM/") - 1))
+        return VERR_CFGM_VALUE_NOT_FOUND; /* borrow status codes from CFGM... */
+    int rc = VINF_SUCCESS;
+    pszName += sizeof("/GVMM/") - 1;
+    if (!strcmp(pszName, "MinSleep"))
+    {
+        if (u64Value <= 100000000)
+            pGVMM->nsMinSleep = u64Value;
+        else
+            rc = VERR_OUT_OF_RANGE;
+    }
+    else if (!strcmp(pszName, "EarlyWakeUp1"))
+    {
+        if (u64Value <= 100000000)
+            pGVMM->nsEarlyWakeUp1 = u64Value;
+        else
+            rc = VERR_OUT_OF_RANGE;
+    }
+    else if (!strcmp(pszName, "EarlyWakeUp2"))
+    {
+        if (u64Value <= 100000000)
+            pGVMM->nsEarlyWakeUp2 = u64Value;
+        else
+            rc = VERR_OUT_OF_RANGE;
+    }
+    else
+        rc = VERR_CFGM_VALUE_NOT_FOUND;
+    return rc;
+}
+
+
+/**
+ * A quick hack for getting global config values.
+ *
+ * @returns VBox status code.
+ *
+ * @param   pSession    The session handle. Used for authentication.
+ * @param   pszName     The variable name.
+ * @param   u64Value    The new value.
+ */
+GVMMR0DECL(int) GVMMR0QueryConfig(PSUPDRVSESSION pSession, const char *pszName, uint64_t *pu64Value)
+{
+    /*
+     * Validate input.
+     */
+    PGVMM pGVMM;
+    GVMM_GET_VALID_INSTANCE(pGVMM, VERR_INTERNAL_ERROR);
+    AssertPtrReturn(pSession, VERR_INVALID_HANDLE);
+    AssertPtrReturn(pszName, VERR_INVALID_POINTER);
+    AssertPtrReturn(pu64Value, VERR_INVALID_POINTER);
+
+    /*
+     * String switch time!
+     */
+    if (strncmp(pszName, "/GVMM/", sizeof("/GVMM/") - 1))
+        return VERR_CFGM_VALUE_NOT_FOUND; /* borrow status codes from CFGM... */
+    int rc = VINF_SUCCESS;
+    pszName += sizeof("/GVMM/") - 1;
+    if (!strcmp(pszName, "MinSleep"))
+        *pu64Value = pGVMM->nsMinSleep;
+    else if (!strcmp(pszName, "EarlyWakeUp1"))
+        *pu64Value = pGVMM->nsEarlyWakeUp1;
+    else if (!strcmp(pszName, "EarlyWakeUp2"))
+        *pu64Value = pGVMM->nsEarlyWakeUp2;
+    else
+        rc = VERR_CFGM_VALUE_NOT_FOUND;
+    return rc;
 }
 
@@ -1128 +1238 @@
                 if (u64 <= u64Now)
                 {
-                    ASMAtomicXchgU64(&pCurGVM->gvmm.s.u64HaltExpire, 0);
+                    if (ASMAtomicXchgU64(&pCurGVM->gvmm.s.u64HaltExpire, 0))
+                    {
+                        int rc = RTSemEventMultiSignal(pCurGVM->gvmm.s.HaltEventMulti);
+                        AssertRC(rc);
+                        cWoken++;
+                    }
+                }
+                else
+                {
+                    cHalted++;
+                    if (u64 <= u64Now + pGVMM->nsEarlyWakeUp1)
+                        cTodo2nd++;
+                    else if (u64 <= u64Now + pGVMM->nsEarlyWakeUp2)
+                        cTodo3rd++;
+                }
+            }
+        }
+    }
+
+    if (cTodo2nd)
+    {
+        for (unsigned i = pGVMM->iUsedHead;
+             i != NIL_GVM_HANDLE && i < RT_ELEMENTS(pGVMM->aHandles);
+             i = pGVMM->aHandles[i].iNext)
+        {
+            PGVM pCurGVM = pGVMM->aHandles[i].pGVM;
+            if (    VALID_PTR(pCurGVM)
+                &&  pCurGVM->u32Magic == GVM_MAGIC
+                &&  pCurGVM->gvmm.s.u64HaltExpire
+                &&  pCurGVM->gvmm.s.u64HaltExpire <= u64Now + pGVMM->nsEarlyWakeUp1)
+            {
+                if (ASMAtomicXchgU64(&pCurGVM->gvmm.s.u64HaltExpire, 0))
+                {
                     int rc = RTSemEventMultiSignal(pCurGVM->gvmm.s.HaltEventMulti);
                     AssertRC(rc);
                     cWoken++;
                 }
-                else
-                {
-                    cHalted++;
-                    /** @todo make these limits configurable! */
-                    if (u64 <= u64Now + 25000 /* 0.025 ms */)
-                        cTodo2nd++;
-                    else if (u64 <= u64Now + 50000 /* 0.050 ms */)
-                        cTodo3rd++;
-                }
             }
         }
     }
 
-    if (cTodo2nd)
+    if (cTodo3rd)
     {
         for (unsigned i = pGVMM->iUsedHead;
@@ -1155 +1288 @@
             if (    VALID_PTR(pCurGVM)
                 &&  pCurGVM->u32Magic == GVM_MAGIC
-                &&  pCurGVM->gvmm.s.u64HaltExpire <= u64Now + 25000 /* 0.025 ms */)
+                &&  pCurGVM->gvmm.s.u64HaltExpire
+                &&  pCurGVM->gvmm.s.u64HaltExpire <= u64Now + pGVMM->nsEarlyWakeUp2)
             {
-                ASMAtomicXchgU64(&pCurGVM->gvmm.s.u64HaltExpire, 0);
-                int rc = RTSemEventMultiSignal(pCurGVM->gvmm.s.HaltEventMulti);
-                AssertRC(rc);
-                cWoken++;
-            }
-        }
-    }
-
-    if (cTodo3rd)
-    {
-        for (unsigned i = pGVMM->iUsedHead;
-             i != NIL_GVM_HANDLE && i < RT_ELEMENTS(pGVMM->aHandles);
-             i = pGVMM->aHandles[i].iNext)
-        {
-            PGVM pCurGVM = pGVMM->aHandles[i].pGVM;
-            if (    VALID_PTR(pCurGVM)
-                &&  pCurGVM->u32Magic == GVM_MAGIC
-                &&  pCurGVM->gvmm.s.u64HaltExpire <= u64Now + 50000 /* 0.050 ms */)
-            {
-                ASMAtomicXchgU64(&pCurGVM->gvmm.s.u64HaltExpire, 0);
-                int rc = RTSemEventMultiSignal(pCurGVM->gvmm.s.HaltEventMulti);
-                AssertRC(rc);
-                cWoken++;
+                if (ASMAtomicXchgU64(&pCurGVM->gvmm.s.u64HaltExpire, 0))
+                {
+                    int rc = RTSemEventMultiSignal(pCurGVM->gvmm.s.HaltEventMulti);
+                    AssertRC(rc);
+                    cWoken++;
+                }
             }
         }
@@ -1232 +1349 @@
     if (    u64Now < u64ExpireGipTime
         &&  (   pGVMM->cVMs > 1
-             || (u64ExpireGipTime - u64Now > 750000 /* 0.750 ms */))) /** @todo make this configurable */
+             || (u64ExpireGipTime - u64Now >= pGVMM->nsMinSleep)))
     {
         pGVM->gvmm.s.StatsSched.cHaltBlocking++;

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

@@ -803 +803 @@
             return GMMR0SeedChunk(pVM, (RTR3PTR)u64Arg);
 
+        /*
+         * A quick GCFGM mock-up.
+         */
+        /** @todo GCFGM with proper access control, ring-3 management interface and all that. */
+        case VMMR0_DO_GCFGM_SET_VALUE:
+        case VMMR0_DO_GCFGM_QUERY_VALUE:
+        {
+            if (pVM || !pReqHdr || u64Arg)
+                return VERR_INVALID_PARAMETER;
+            PGCFGMVALUEREQ pReq = (PGCFGMVALUEREQ)pReqHdr;
+            if (pReq->Hdr.cbReq != sizeof(*pReq))
+                return VERR_INVALID_PARAMETER;
+            int rc;
+            if (enmOperation == VMMR0_DO_GCFGM_SET_VALUE)
+            {
+                rc = GVMMR0SetConfig(pReq->pSession, &pReq->szName[0], pReq->u64Value);
+                //if (rc == VERR_CFGM_VALUE_NOT_FOUND)
+                //    rc = GMMR0SetConfig(pReq->pSession, &pReq->szName[0], pReq->u64Value);
+            }
+            else
+            {
+                rc = GVMMR0QueryConfig(pReq->pSession, &pReq->szName[0], &pReq->u64Value);
+                //if (rc == VERR_CFGM_VALUE_NOT_FOUND)
+                //    rc = GMMR0QueryConfig(pReq->pSession, &pReq->szName[0], &pReq->u64Value);
+            }
+            return rc;
+        }
+
 
 #if 0//def VBOX_WITH_INTERNAL_NETWORKING - currently busted

trunk/src/VBox/VMM/testcase/Makefile.kmk

@@ -22 +22 @@
 # Target lists.
 #
-PROGRAMS   += tstVMStructSize tstVMStructGC tstAsmStructs tstAsmStructsGC tstVMM tstVMM-HwAccm
+PROGRAMS   += tstVMStructSize tstVMStructGC tstAsmStructs tstAsmStructsGC tstVMM tstVMM-HwAccm tstGlobalConfig
 ifneq ($(BUILD_TARGET),win)
 PROGRAMS   += tstVMMFork
@@ -103 +103 @@
 tstAsmStructs.cpp_DEPS  = $(PATH_TARGET)/tstAsmStructsHC.h $(PATH_TARGET)/tstAsmStructsGC.h
 
+
+tstGlobalConfig_TEMPLATE= VBOXR3TSTEXE
+tstGlobalConfig_SOURCES = tstGlobalConfig.cpp
+tstGlobalConfig_LIBS    = $(LIB_RUNTIME)
 
 tstMMHyperHeap_TEMPLATE = VBOXR3TSTEXE

trunk/src/VBox/VMM/testcase/tstGlobalConfig.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VMM Testcase.
+ * Ring-3 Management program for the GCFGM mock-up.
  */
 
 /*
- * Copyright (C) 2006-2007 innotek GmbH
+ * Copyright (C) 2007 innotek GmbH
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20 +20 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include <VBox/vm.h>
 #include <VBox/vmm.h>
-#include <VBox/cpum.h>
 #include <VBox/err.h>
-#include <VBox/log.h>
 #include <iprt/assert.h>
-#include <iprt/runtime.h>
-#include <iprt/semaphore.h>
+#include <iprt/initterm.h>
 #include <iprt/stream.h>
+#include <iprt/string.h>
 
 
-/*******************************************************************************
-*   Defined Constants And Macros                                               *
-*******************************************************************************/
-#define TESTCASE    "tstVMM"
-
-VMMR3DECL(int) VMMDoTest(PVM pVM);
+/**
+ * Prints the usage and returns 1.
+ * @return 1
+ */
+static int Usage(void)
+{
+    RTPrintf("usage: tstGlobalConfig <value-name> [new value]\n");
+    return 1;
+}
 
 
 int main(int argc, char **argv)
 {
-    int     rcRet = 0;                  /* error count. */
-
-    RTR3Init();
+    RTR3Init(false, 0);
 
     /*
-     * Create empty VM.
+     * Parse args, building the request as we do so.
      */
-    RTPrintf(TESTCASE ": Initializing...\n");
-    PVM pVM;
-    int rc = VMR3Create(NULL, NULL, NULL, NULL, &pVM);
-    if (VBOX_SUCCESS(rc))
+    if (argc <= 1)
+        return Usage();
+    if (argc > 3)
     {
-        /*
-         * Do testing.
-         */
-        RTPrintf(TESTCASE ": Testing...\n");
-        PVMREQ pReq1 = NULL;
-        rc = VMR3ReqCall(pVM, &pReq1, RT_INDEFINITE_WAIT, (PFNRT)VMMDoTest, 1, pVM);
-        AssertRC(rc);
-        VMR3ReqFree(pReq1);
-
-        STAMR3Dump(pVM, "*");
-
-        /*
-         * Cleanup.
-         */
-        rc = VMR3Destroy(pVM);
-        if (!VBOX_SUCCESS(rc))
-        {
-            RTPrintf(TESTCASE ": error: failed to destroy vm! rc=%d\n", rc);
-            rcRet++;
-        }
-    }
-    else
-    {
-        RTPrintf(TESTCASE ": fatal error: failed to create vm! rc=%d\n", rc);
-        rcRet++;
+        RTPrintf("syntax error: too many arguments\n");
+        Usage();
+        return 1;
     }
 
-    return rcRet;
+    VMMR0OPERATION enmOp = VMMR0_DO_GCFGM_QUERY_VALUE;
+    GCFGMVALUEREQ Req;
+    memset(&Req, 0, sizeof(Req));
+    Req.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
+    Req.Hdr.cbReq = sizeof(Req);
+
+    /* arg[1] = szName */
+    size_t cch = strlen(argv[1]);
+    if (cch < 2 || argv[1][0] != '/')
+    {
+        RTPrintf("syntax error: malformed name '%s'\n", argv[1]);
+        return 1;
+    }
+    if (cch >= sizeof(Req.szName))
+    {
+        RTPrintf("syntax error: the name is too long. (max %zu chars)\n", argv[1], sizeof(Req.szName) - 1);
+        return 1;
+    }
+    memcpy(&Req.szName[0], argv[1], cch + 1);
+
+    /* argv[2] = u64SetValue; optional */
+    if (argc == 3)
+    {
+        char *pszNext = NULL;
+        int rc = RTStrToUInt64Ex(argv[2], &pszNext, 0, &Req.u64Value);
+        if (RT_FAILURE(rc) || *pszNext)
+        {
+            RTPrintf("syntax error: '%s' didn't convert successfully to a number. (%Rrc,'%s')\n", argv[2], rc, pszNext);
+            return 1;
+        }
+        enmOp = VMMR0_DO_GCFGM_SET_VALUE;
+    }
+
+    /*
+     * Open the session, load ring-0 and issue the request.
+     */
+    PSUPDRVSESSION pSession;
+    int rc = SUPInit(&pSession, 0);
+    if (RT_FAILURE(rc))
+    {
+        RTPrintf("tstGlobalConfig: SUPInit -> %Rrc\n", rc);
+        return 1;
+    }
+
+    rc = SUPLoadVMM("./VMMR0.r0");
+    if (RT_SUCCESS(rc))
+    {
+        Req.pSession = pSession;
+        rc = SUPCallVMMR0Ex(NIL_RTR0PTR, enmOp, 0, &Req.Hdr);
+        if (RT_SUCCESS(rc))
+        {
+            if (enmOp == VMMR0_DO_GCFGM_QUERY_VALUE)
+                RTPrintf("%s = %RU64 (%#RX64)\n", Req.szName, Req.u64Value, Req.u64Value);
+            else
+                RTPrintf("Successfully set %s = %RU64 (%#RX64)\n", Req.szName, Req.u64Value, Req.u64Value);
+        }
+        else if (enmOp == VMMR0_DO_GCFGM_QUERY_VALUE)
+            RTPrintf("error: Failed to query '%s', rc=%Rrc\n", Req.szName, rc);
+        else
+            RTPrintf("error: Failed to set '%s' to %RU64, rc=%Rrc\n", Req.szName, Req.u64Value, rc);
+
+    }
+    SUPTerm(false /* not forced */);
+
+    return RT_FAILURE(rc) ? 1 : 0;
 }