Changeset 107893 in vbox for trunk/src/VBox/VMM

Timestamp:

Jan 22, 2025 3:31:45 PM (2 weeks ago)

Author:

vboxsync

Message:

VMM,VBox/types.h,VBox/err.h: Added VM target platform arch members to the VM structures (mostly for ring-0). Also added the structure sizes and svn revision to VMMR0_DO_GVMM_CREATE_VM. jiraref:VBP-1470

Location:

trunk/src/VBox/VMM

Files:

• Makefile.kmk (modified) (1 diff)
• VMMR0/GVMMR0.cpp (modified) (10 diffs)
• VMMR3/GVMMR3.cpp (modified) (5 diffs)
• VMMR3/VM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/Makefile.kmk

@@ -1121 +1121 @@
 
 #
-# For vmmGetSvnRev.
+# For VMMGetSvnRev.
 #
 VMMAll/VMMAll.cpp_DEFS = VBOX_SVN_REV=$(VBOX_SVN_REV)

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

@@ -344 +344 @@
 *   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
-static void gvmmR0InitPerVMData(PGVM pGVM, int16_t hSelf, VMCPUID cCpus, PSUPDRVSESSION pSession);
+static void gvmmR0InitPerVMData(PGVM pGVM, int16_t hSelf, VMTARGET enmTarget, VMCPUID cCpus, PSUPDRVSESSION pSession);
 static DECLCALLBACK(void) gvmmR0HandleObjDestructor(void *pvObj, void *pvGVMM, void *pvHandle);
 static int gvmmR0ByGVM(PGVM pGVM, PGVMM *ppGVMM, bool fTakeUsedLock);
@@ -800 +800 @@
         return VERR_INVALID_POINTER;
 
+    /* Check that VBoxVMM and VMMR0 are likely to have the same idea about the structures. */
+    if (pReq->cbVM != sizeof(VM))
+    {
+        LogRel(("GVMMR0CreateVMReq: cbVM=%#x, expcted %#x\n", pReq->cbVM, sizeof(VM)));
+        return VINF_GVM_MISMATCH_VM_SIZE;
+    }
+    if (pReq->cbVCpu != sizeof(VMCPU))
+    {
+        LogRel(("GVMMR0CreateVMReq: cbVCpu=%#x, expcted %#x\n", pReq->cbVCpu, sizeof(VMCPU)));
+        return VINF_GVM_MISMATCH_VMCPU_SIZE;
+    }
+    if (pReq->uStructVersion != 1)
+    {
+        LogRel(("GVMMR0CreateVMReq: uStructVersion=%#x, expcted %#x\n", pReq->uStructVersion, 1));
+        return VINF_GVM_MISMATCH_VM_STRUCT_VER;
+    }
+    if (pReq->uSvnRevision != VMMGetSvnRev())
+    {
+        LogRel(("GVMMR0CreateVMReq: uSvnRevision=%u, expcted %u\n", pReq->uSvnRevision, VMMGetSvnRev()));
+        return VINF_GVM_MISMATCH_VMCPU_SIZE;
+    }
+
     /*
      * Execute it.
@@ -806 +828 @@
     pReq->pVMR0 = NULL;
     pReq->pVMR3 = NIL_RTR3PTR;
-    int rc = GVMMR0CreateVM(pSession, pReq->cCpus, &pGVM);
+    int rc = GVMMR0CreateVM(pSession, pReq->enmTarget, pReq->cCpus, &pGVM);
     if (RT_SUCCESS(rc))
     {
@@ -828 +850 @@
  * @thread  EMT.
  */
-GVMMR0DECL(int) GVMMR0CreateVM(PSUPDRVSESSION pSession, uint32_t cCpus, PGVM *ppGVM)
+GVMMR0DECL(int) GVMMR0CreateVM(PSUPDRVSESSION pSession, VMTARGET enmTarget, uint32_t cCpus, PGVM *ppGVM)
 {
     LogFlow(("GVMMR0CreateVM: pSession=%p\n", pSession));
@@ -839 +861 @@
     if (    cCpus == 0
         ||  cCpus > VMM_MAX_CPU_COUNT)
+        return VERR_INVALID_PARAMETER;
+    if (   enmTarget != VMTARGET_X86
+        && enmTarget != VMTARGET_ARMV8)
         return VERR_INVALID_PARAMETER;
 
@@ -915 +940 @@
                          */
                         RT_BZERO(pGVM, cPages << HOST_PAGE_SHIFT);
-                        gvmmR0InitPerVMData(pGVM, iHandle, cCpus, pSession);
+                        gvmmR0InitPerVMData(pGVM, iHandle, enmTarget, cCpus, pSession);
                         pGVM->gvmm.s.VMMemObj  = hVMMemObj;
 #ifndef VBOX_WITH_MINIMAL_R0
@@ -1116 +1141 @@
  * @param   pGVM        Pointer to the global VM structure.
  * @param   hSelf       The handle.
+ * @param   enmTarget   The target platform architecture of the VM.
  * @param   cCpus       The CPU count.
  * @param   pSession    The session this VM is associated with.
  */
-static void gvmmR0InitPerVMData(PGVM pGVM, int16_t hSelf, VMCPUID cCpus, PSUPDRVSESSION pSession)
+static void gvmmR0InitPerVMData(PGVM pGVM, int16_t hSelf, VMTARGET enmTarget, VMCPUID cCpus, PSUPDRVSESSION pSession)
 {
     AssertCompile(RT_SIZEOFMEMB(GVM,gvmm.s) <= RT_SIZEOFMEMB(GVM,gvmm.padding));
@@ -1130 +1156 @@
     pGVM->hSelf            = hSelf;
     pGVM->cCpus            = cCpus;
+    pGVM->enmTarget        = enmTarget;
     pGVM->pSession         = pSession;
     pGVM->pSelf            = pGVM;
@@ -1143 +1170 @@
     pGVM->cbSelf           = sizeof(VM);
     pGVM->cbVCpu           = sizeof(VMCPU);
+    pGVM->enmTargetUnsafe  = enmTarget;
 
     /* GVMM: */
@@ -1172 +1200 @@
         pGVM->aCpus[i].idCpu                 = i;
         pGVM->aCpus[i].idCpuUnsafe           = i;
+        pGVM->aCpus[i].enmTarget             = enmTarget;
+        pGVM->aCpus[i].enmTargetUnsafe       = enmTarget;
         pGVM->aCpus[i].gvmm.s.HaltEventMulti = NIL_RTSEMEVENTMULTI;
         pGVM->aCpus[i].gvmm.s.VMCpuMapObj    = NIL_RTR0MEMOBJ;

trunk/src/VBox/VMM/VMMR3/GVMMR3.cpp

@@ -46 +46 @@
  * @returns VBox status code.
  * @param   pUVM        The user mode VM handle.
+ * @param   enmTarget   The target platform architecture of the VM.
  * @param   cCpus       The number of CPUs to create the VM for.
  * @param   pSession    The support driver session handle.
@@ -52 +53 @@
  *                      for use in VMMR0 calls.
  */
-VMMR3_INT_DECL(int) GVMMR3CreateVM(PUVM pUVM, uint32_t cCpus, PSUPDRVSESSION pSession, PVM *ppVM, PRTR0PTR ppVMR0)
+VMMR3_INT_DECL(int) GVMMR3CreateVM(PUVM pUVM, VMTARGET enmTarget, uint32_t cCpus, PSUPDRVSESSION pSession,
+                                   PVM *ppVM, PRTR0PTR ppVMR0)
 {
     AssertReturn(cCpus >= VMM_MIN_CPU_COUNT && cCpus <= VMM_MAX_CPU_COUNT, VERR_INVALID_PARAMETER);
+    AssertReturn(enmTarget == VMTARGET_X86 || enmTarget == VMTARGET_ARMV8, VERR_INVALID_PARAMETER);
     AssertCompile((sizeof(VM)    & HOST_PAGE_OFFSET_MASK) == 0);
     AssertCompile((sizeof(VMCPU) & HOST_PAGE_OFFSET_MASK) == 0);
@@ -65 +68 @@
         CreateVMReq.Hdr.cbReq       = sizeof(CreateVMReq);
         CreateVMReq.pSession        = pSession;
+        CreateVMReq.enmTarget       = enmTarget;
+        CreateVMReq.cCpus           = cCpus;
+        CreateVMReq.cbVM            = sizeof(VM);
+        CreateVMReq.cbVCpu          = sizeof(VMCPU);
+        CreateVMReq.uStructVersion  = 1;
+        CreateVMReq.uSvnRevision    = VMMGetSvnRev();
         CreateVMReq.pVMR0           = NIL_RTR0PTR;
         CreateVMReq.pVMR3           = NULL;
-        CreateVMReq.cCpus           = cCpus;
         rc = SUPR3CallVMMR0Ex(NIL_RTR0PTR, NIL_VMCPUID, VMMR0_DO_GVMM_CREATE_VM, 0, &CreateVMReq.Hdr);
         if (RT_SUCCESS(rc))
@@ -73 +81 @@
             *ppVM   = CreateVMReq.pVMR3;
             *ppVMR0 = CreateVMReq.pVMR0;
+            Assert(CreateVMReq.pVMR3->enmTarget == enmTarget);
         }
     }
@@ -101 +110 @@
         pVM->cbVCpu               = sizeof(VMCPU);
         pVM->uStructVersion       = 1;
+        pVM->enmTarget            = enmTarget;
 
         /* CPUs: */

trunk/src/VBox/VMM/VMMR3/VM.cpp

@@ -598 +598 @@
      */
     RTR0PTR pVMR0;
-    int rc = GVMMR3CreateVM(pUVM, cCpus, pUVM->vm.s.pSession, &pUVM->pVM, &pVMR0);
+    int rc = GVMMR3CreateVM(pUVM, VMTARGET_DEFAULT, cCpus, pUVM->vm.s.pSession, &pUVM->pVM, &pVMR0);
     if (RT_SUCCESS(rc))
     {
@@ -607 +607 @@
         AssertRelease(pVM->cCpus == cCpus);
         AssertRelease(pVM->uCpuExecutionCap == 100);
+        AssertRelease(pVM->enmTarget == VMTARGET_DEFAULT);
         AssertCompileMemberAlignment(VM, cpum, 64);
         AssertCompileMemberAlignment(VM, tm, 64);