Changeset 80077 in vbox

Timestamp:

Jul 31, 2019 2:30:19 PM (6 years ago)

Author:

vboxsync

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

132517

Message:

VMM: Kicking out raw-mode - GIM. bugref:9517

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/GIMAllHv.cpp (modified) (2 diffs)
• VMMAll/GIMAllKvm.cpp (modified) (3 diffs)
• VMMR3/GIMHv.cpp (modified) (2 diffs)
• VMMR3/GIMKvm.cpp (modified) (1 diff)
• include/GIMHvInternal.h (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/GIMAllHv.cpp

@@ -1364 +1364 @@
  * Whether we need to trap \#UD exceptions in the guest.
  *
- * We only need to trap \#UD exceptions for raw-mode guests when hypercalls are
- * enabled. For HM VMs, the hypercall would be handled via the
+ * We only needed to trap \#UD exceptions for the old raw-mode guests when
+ * hypercalls are enabled. For HM VMs, the hypercall would be handled via the
  * VMCALL/VMMCALL VM-exit.
  *
@@ -1372 +1372 @@
 VMM_INT_DECL(bool) gimHvShouldTrapXcptUD(PVMCPU pVCpu)
 {
-#ifdef VBOX_WITH_RAW_MODE
-    if (   VM_IS_RAW_MODE_ENABLED(pVCpu->CTX_SUFF(pVM))
-        && gimHvAreHypercallsEnabled(pVCpu))
-        return true;
-#else
     RT_NOREF(pVCpu);
-#endif
     return false;
 }

trunk/src/VBox/VMM/VMMAll/GIMAllKvm.cpp

@@ -239 +239 @@
         {
             bool fEnable = RT_BOOL(uRawValue & MSR_GIM_KVM_SYSTEM_TIME_ENABLE_BIT);
-#ifdef IN_RING0
+#ifndef IN_RING3
             NOREF(fEnable); NOREF(pKvmCpu);
             gimR0KvmUpdateSystemTime(pVM, pVCpu);
-            return VINF_CPUM_R3_MSR_WRITE;
-#elif defined(IN_RC)
-            Assert(pVM->cCpus == 1);
-            if (fEnable)
-            {
-                RTCCUINTREG fEFlags  = ASMIntDisableFlags();
-                pKvmCpu->uTsc        = TMCpuTickGetNoCheck(pVCpu) | UINT64_C(1);
-                pKvmCpu->uVirtNanoTS = TMVirtualGetNoCheck(pVM)   | UINT64_C(1);
-                ASMSetFlags(fEFlags);
-            }
             return VINF_CPUM_R3_MSR_WRITE;
 #else /* IN_RING3 */
@@ -288 +278 @@
             }
             return VINF_SUCCESS;
-#endif
+#endif /* IN_RING3 */
         }
 
@@ -405 +395 @@
             PCGIMKVM pKvm = &pVM->gim.s.u.Kvm;
             if (   uDisOpcode != pKvm->uOpcodeNative
-                && !VM_IS_RAW_MODE_ENABLED(pVM)
                 && cbInstr == sizeof(pKvm->abOpcodeNative) )
             {

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

@@ -510 +510 @@
                 AssertLogRelRCReturn(rc, rc);
                 pHvStimer->pTimerR0 = TMTimerR0Ptr(pHvStimer->pTimerR3);
-                pHvStimer->pTimerRC = TMTimerRCPtr(pHvStimer->pTimerR3);
             }
         }
@@ -622 +621 @@
 VMMR3_INT_DECL(void) gimR3HvRelocate(PVM pVM, RTGCINTPTR offDelta)
 {
-    RT_NOREF1(offDelta);
-
-    PCGIMHV pHv = &pVM->gim.s.u.Hv;
-    if (   (pHv->uBaseFeat & GIM_HV_BASE_FEAT_STIMER_MSRS)
-        || (pHv->uBaseFeat & GIM_HV_BASE_FEAT_BASIC_SYNIC_MSRS))
-    {
-        for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
-        {
-            PGIMHVCPU pHvCpu = &pVM->aCpus[idCpu].gim.s.u.HvCpu;
-            for (uint8_t idxStimer = 0; idxStimer < RT_ELEMENTS(pHvCpu->aStimers); idxStimer++)
-            {
-                PGIMHVSTIMER pHvStimer = &pHvCpu->aStimers[idxStimer];
-                pHvStimer->pTimerRC = TMTimerRCPtr(pHvStimer->pTimerR3);
-            }
-        }
-    }
+    RT_NOREF(pVM, offDelta);
 }
 

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

@@ -167 +167 @@
     AssertLogRelRCReturn(rc, rc);
     AssertLogRelReturn(cbHypercall == sizeof(pKvm->abOpcodeNative), VERR_GIM_IPE_1);
-    pKvm->fTrapXcptUD = pKvm->uOpcodeNative != OP_VMCALL || VM_IS_RAW_MODE_ENABLED(pVM);
+    pKvm->fTrapXcptUD = pKvm->uOpcodeNative != OP_VMCALL;
 
     return VINF_SUCCESS;

trunk/src/VBox/VMM/include/GIMHvInternal.h

@@ -1198 +1198 @@
     /** Per-VM R0 Spinlock for protecting EMT writes to the TSC page. */
     RTSPINLOCK                  hSpinlockR0;
-#if HC_ARCH_BITS == 32
-    uint32_t                    u32Alignment1;
-#endif
     /** The TSC frequency (in HZ) reported to the guest. */
     uint64_t                    cTscTicksPerSecond;
@@ -1270 +1267 @@
     /** Synthetic timer object - R3 ptr. */
     PTMTIMERR3                  pTimerR3;
-    /** Synthetic timer object - RC ptr. */
-    PTMTIMERRC                  pTimerRC;
-    /** RC alignment padding. */
-    RTRCPTR                     uAlignment0;
     /** Virtual CPU ID this timer belongs to (for reverse mapping). */
     VMCPUID                     idCpu;