Changeset 80274 in vbox for trunk/src/VBox/VMM/VMMR0/HMR0.cpp

Timestamp:

Aug 14, 2019 2:34:38 PM (5 years ago)

Author:

vboxsync

Message:

VMM: Refactoring VMMR0/* and VMMRZ/* to use VMCC & VMMCPUCC. bugref:9217

File:

• trunk/src/VBox/VMM/VMMR0/HMR0.cpp (modified) (30 diffs)

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

@@ -20 +20 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define VBOX_BUGREF_9217_PART_I
 #define LOG_GROUP LOG_GROUP_HM
 #define VMCPU_INCL_CPUM_GST_CTX
@@ -25 +26 @@
 #include <VBox/vmm/pgm.h>
 #include "HMInternal.h"
-#include <VBox/vmm/vm.h>
+#include <VBox/vmm/vmcc.h>
 #include <VBox/vmm/hm_svm.h>
 #include <VBox/vmm/hmvmxinline.h>
@@ -87 +88 @@
     /** @name Ring-0 method table for AMD-V and VT-x specific operations.
      * @{ */
-    DECLR0CALLBACKMEMBER(int,  pfnEnterSession, (PVMCPU pVCpu));
-    DECLR0CALLBACKMEMBER(void, pfnThreadCtxCallback, (RTTHREADCTXEVENT enmEvent, PVMCPU pVCpu, bool fGlobalInit));
-    DECLR0CALLBACKMEMBER(int,  pfnExportHostState, (PVMCPU pVCpu));
-    DECLR0CALLBACKMEMBER(VBOXSTRICTRC, pfnRunGuestCode, (PVMCPU pVCpu));
-    DECLR0CALLBACKMEMBER(int,  pfnEnableCpu, (PHMPHYSCPU pHostCpu, PVM pVM, void *pvCpuPage, RTHCPHYS HCPhysCpuPage,
+    DECLR0CALLBACKMEMBER(int,  pfnEnterSession, (PVMCPUCC pVCpu));
+    DECLR0CALLBACKMEMBER(void, pfnThreadCtxCallback, (RTTHREADCTXEVENT enmEvent, PVMCPUCC pVCpu, bool fGlobalInit));
+    DECLR0CALLBACKMEMBER(int,  pfnExportHostState, (PVMCPUCC pVCpu));
+    DECLR0CALLBACKMEMBER(VBOXSTRICTRC, pfnRunGuestCode, (PVMCPUCC pVCpu));
+    DECLR0CALLBACKMEMBER(int,  pfnEnableCpu, (PHMPHYSCPU pHostCpu, PVMCC pVM, void *pvCpuPage, RTHCPHYS HCPhysCpuPage,
                                               bool fEnabledByHost, PCSUPHWVIRTMSRS pHwvirtMsrs));
     DECLR0CALLBACKMEMBER(int,  pfnDisableCpu, (void *pvCpuPage, RTHCPHYS HCPhysCpuPage));
-    DECLR0CALLBACKMEMBER(int,  pfnInitVM, (PVM pVM));
-    DECLR0CALLBACKMEMBER(int,  pfnTermVM, (PVM pVM));
-    DECLR0CALLBACKMEMBER(int,  pfnSetupVM, (PVM pVM));
+    DECLR0CALLBACKMEMBER(int,  pfnInitVM, (PVMCC pVM));
+    DECLR0CALLBACKMEMBER(int,  pfnTermVM, (PVMCC pVM));
+    DECLR0CALLBACKMEMBER(int,  pfnSetupVM, (PVMCC pVM));
     /** @} */
 
@@ -227 +228 @@
  * @{ */
 
-static DECLCALLBACK(int) hmR0DummyEnter(PVMCPU pVCpu)
+static DECLCALLBACK(int) hmR0DummyEnter(PVMCPUCC pVCpu)
 {
     RT_NOREF1(pVCpu);
@@ -233 +234 @@
 }
 
-static DECLCALLBACK(void) hmR0DummyThreadCtxCallback(RTTHREADCTXEVENT enmEvent, PVMCPU pVCpu, bool fGlobalInit)
+static DECLCALLBACK(void) hmR0DummyThreadCtxCallback(RTTHREADCTXEVENT enmEvent, PVMCPUCC pVCpu, bool fGlobalInit)
 {
     RT_NOREF3(enmEvent, pVCpu, fGlobalInit);
 }
 
-static DECLCALLBACK(int) hmR0DummyEnableCpu(PHMPHYSCPU pHostCpu, PVM pVM, void *pvCpuPage, RTHCPHYS HCPhysCpuPage,
+static DECLCALLBACK(int) hmR0DummyEnableCpu(PHMPHYSCPU pHostCpu, PVMCC pVM, void *pvCpuPage, RTHCPHYS HCPhysCpuPage,
                                             bool fEnabledBySystem, PCSUPHWVIRTMSRS pHwvirtMsrs)
 {
@@ -251 +252 @@
 }
 
-static DECLCALLBACK(int) hmR0DummyInitVM(PVM pVM)
+static DECLCALLBACK(int) hmR0DummyInitVM(PVMCC pVM)
 {
     RT_NOREF1(pVM);
@@ -257 +258 @@
 }
 
-static DECLCALLBACK(int) hmR0DummyTermVM(PVM pVM)
+static DECLCALLBACK(int) hmR0DummyTermVM(PVMCC pVM)
 {
     RT_NOREF1(pVM);
@@ -263 +264 @@
 }
 
-static DECLCALLBACK(int) hmR0DummySetupVM(PVM pVM)
+static DECLCALLBACK(int) hmR0DummySetupVM(PVMCC pVM)
 {
     RT_NOREF1(pVM);
@@ -269 +270 @@
 }
 
-static DECLCALLBACK(VBOXSTRICTRC) hmR0DummyRunGuestCode(PVMCPU pVCpu)
+static DECLCALLBACK(VBOXSTRICTRC) hmR0DummyRunGuestCode(PVMCPUCC pVCpu)
 {
     RT_NOREF(pVCpu);
@@ -275 +276 @@
 }
 
-static DECLCALLBACK(int) hmR0DummyExportHostState(PVMCPU pVCpu)
+static DECLCALLBACK(int) hmR0DummyExportHostState(PVMCPUCC pVCpu)
 {
     RT_NOREF1(pVCpu);
@@ -788 +789 @@
  * @remarks Maybe called with interrupts disabled!
  */
-static int hmR0EnableCpu(PVM pVM, RTCPUID idCpu)
+static int hmR0EnableCpu(PVMCC pVM, RTCPUID idCpu)
 {
     PHMPHYSCPU pHostCpu = &g_HmR0.aCpuInfo[idCpu];
@@ -824 +825 @@
 static DECLCALLBACK(void) hmR0EnableCpuCallback(RTCPUID idCpu, void *pvUser1, void *pvUser2)
 {
-    PVM             pVM      = (PVM)pvUser1;     /* can be NULL! */
+    PVMCC             pVM      = (PVMCC)pvUser1;     /* can be NULL! */
     PHMR0FIRSTRC    pFirstRc = (PHMR0FIRSTRC)pvUser2;
     AssertReturnVoid(g_HmR0.fGlobalInit);
@@ -840 +841 @@
 static DECLCALLBACK(int32_t) hmR0EnableAllCpuOnce(void *pvUser)
 {
-    PVM pVM = (PVM)pvUser;
+    PVMCC pVM = (PVMCC)pvUser;
 
     /*
@@ -956 +957 @@
  * @param   pVM                 The cross context VM structure.
  */
-VMMR0_INT_DECL(int) HMR0EnableAllCpus(PVM pVM)
+VMMR0_INT_DECL(int) HMR0EnableAllCpus(PVMCC pVM)
 {
     /* Make sure we don't touch HM after we've disabled HM in preparation of a suspend. */
@@ -1042 +1043 @@
  * @param   enmEvent            The Mp event.
  * @param   idCpu               The identifier for the CPU the function is called on.
- * @param   pvData              Opaque data (PVM pointer).
+ * @param   pvData              Opaque data (PVMCC pointer).
  */
 static DECLCALLBACK(void) hmR0MpEventCallback(RTMPEVENT enmEvent, RTCPUID idCpu, void *pvData)
@@ -1158 +1159 @@
  *          vmR3InitRing3().
  */
-VMMR0_INT_DECL(int) HMR0InitVM(PVM pVM)
+VMMR0_INT_DECL(int) HMR0InitVM(PVMCC pVM)
 {
     AssertReturn(pVM, VERR_INVALID_PARAMETER);
@@ -1235 +1236 @@
      * Initialize some per-VCPU fields.
      */
-    for (VMCPUID i = 0; i < pVM->cCpus; i++)
-    {
-        PVMCPU pVCpu = &pVM->aCpus[i];
+    for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
+    {
+        PVMCPUCC pVCpu = VMCC_GET_CPU(pVM, idCpu);
         pVCpu->hm.s.idEnteredCpu   = NIL_RTCPUID;
         pVCpu->hm.s.idLastCpu      = NIL_RTCPUID;
@@ -1267 +1268 @@
  * @param   pVM         The cross context VM structure.
  */
-VMMR0_INT_DECL(int) HMR0TermVM(PVM pVM)
+VMMR0_INT_DECL(int) HMR0TermVM(PVMCC pVM)
 {
     Log(("HMR0TermVM: %p\n", pVM));
@@ -1290 +1291 @@
  * @param   pVM         The cross context VM structure.
  */
-VMMR0_INT_DECL(int) HMR0SetupVM(PVM pVM)
+VMMR0_INT_DECL(int) HMR0SetupVM(PVMCC pVM)
 {
     Log(("HMR0SetupVM: %p\n", pVM));
@@ -1299 +1300 @@
 
     /* On first entry we'll sync everything. */
-    for (VMCPUID i = 0; i < pVM->cCpus; i++)
-    {
-        PVMCPU pVCpu = &pVM->aCpus[i];
-        pVCpu->hm.s.fCtxChanged |= HM_CHANGED_HOST_CONTEXT | HM_CHANGED_ALL_GUEST;
-    }
+    VMCC_FOR_EACH_VMCPU_STMT(pVM, pVCpu->hm.s.fCtxChanged |= HM_CHANGED_HOST_CONTEXT | HM_CHANGED_ALL_GUEST);
 
     /*
@@ -1351 +1348 @@
  * @remarks No-long-jump zone!!!
  */
-VMMR0_INT_DECL(int) hmR0EnterCpu(PVMCPU pVCpu)
+VMMR0_INT_DECL(int) hmR0EnterCpu(PVMCPUCC pVCpu)
 {
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
@@ -1384 +1381 @@
  * @remarks This is called with preemption disabled.
  */
-VMMR0_INT_DECL(int) HMR0Enter(PVMCPU pVCpu)
+VMMR0_INT_DECL(int) HMR0Enter(PVMCPUCC pVCpu)
 {
     /* Make sure we can't enter a session after we've disabled HM in preparation of a suspend. */
@@ -1437 +1434 @@
  * @remarks No-long-jump zone!!!
  */
-VMMR0_INT_DECL(int) HMR0LeaveCpu(PVMCPU pVCpu)
+VMMR0_INT_DECL(int) HMR0LeaveCpu(PVMCPUCC pVCpu)
 {
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
@@ -1472 +1469 @@
 VMMR0_INT_DECL(void) HMR0ThreadCtxCallback(RTTHREADCTXEVENT enmEvent, void *pvUser)
 {
-    PVMCPU pVCpu = (PVMCPU)pvUser;
+    PVMCPUCC pVCpu = (PVMCPUCC)pvUser;
     Assert(pVCpu);
     Assert(g_HmR0.pfnThreadCtxCallback);
@@ -1491 +1488 @@
  *          used!!!
  */
-VMMR0_INT_DECL(int) HMR0RunGuestCode(PVM pVM, PVMCPU pVCpu)
+VMMR0_INT_DECL(int) HMR0RunGuestCode(PVMCC pVM, PVMCPUCC pVCpu)
 {
     RT_NOREF(pVM);
@@ -1527 +1524 @@
  * @param   pVCpu   The cross context virtual CPU structure of the calling EMT.
  */
-VMMR0_INT_DECL(void) HMR0NotifyCpumUnloadedGuestFpuState(PVMCPU pVCpu)
+VMMR0_INT_DECL(void) HMR0NotifyCpumUnloadedGuestFpuState(PVMCPUCC pVCpu)
 {
     ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_GUEST_CR0);
@@ -1538 +1535 @@
  * @param   pVCpu   The cross context virtual CPU structure of the calling EMT.
  */
-VMMR0_INT_DECL(void) HMR0NotifyCpumModifiedHostCr0(PVMCPU pVCpu)
+VMMR0_INT_DECL(void) HMR0NotifyCpumModifiedHostCr0(PVMCPUCC pVCpu)
 {
     ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_HOST_CONTEXT);
@@ -1561 +1558 @@
  * @param   GCVirt      Page to invalidate.
  */
-VMMR0_INT_DECL(int) HMR0InvalidatePage(PVMCPU pVCpu, RTGCPTR GCVirt)
-{
-    PVM pVM = pVCpu->CTX_SUFF(pVM);
+VMMR0_INT_DECL(int) HMR0InvalidatePage(PVMCPUCC pVCpu, RTGCPTR GCVirt)
+{
+    PVMCC pVM = pVCpu->CTX_SUFF(pVM);
     if (pVM->hm.s.vmx.fSupported)
         return VMXR0InvalidatePage(pVCpu, GCVirt);
@@ -1592 +1589 @@
  * @param   fWhat       What to import, CPUMCTX_EXTRN_XXX.
  */
-VMMR0_INT_DECL(int) HMR0ImportStateOnDemand(PVMCPU pVCpu, uint64_t fWhat)
+VMMR0_INT_DECL(int) HMR0ImportStateOnDemand(PVMCPUCC pVCpu, uint64_t fWhat)
 {
     if (pVCpu->CTX_SUFF(pVM)->hm.s.vmx.fSupported)
@@ -1730 +1727 @@
  * @param   fFlags  The dumping flags (HM_DUMP_REG_FLAGS_XXX).
  */
-VMMR0_INT_DECL(void) hmR0DumpRegs(PVMCPU pVCpu, uint32_t fFlags)
+VMMR0_INT_DECL(void) hmR0DumpRegs(PVMCPUCC pVCpu, uint32_t fFlags)
 {
     /*