Changeset 45701 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Apr 24, 2013 2:21:09 PM (12 years ago)

Author:

vboxsync

Message:

VMM: SELM and VMM early HM init changes.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• EMAll.cpp (modified) (1 diff)
• HMAll.cpp (modified) (1 diff)
• IEMAll.cpp (modified) (1 diff)
• IEMAllCImpl.cpp.h (modified) (1 diff)
• SELMAll.cpp (modified) (12 diffs)

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

@@ -1538 +1538 @@
 # endif
 # ifdef VBOX_WITH_RAW_MODE
-        if ((val ^ oldval) & X86_CR4_VME)
+        if (((val ^ oldval) & X86_CR4_VME) && !HMIsEnabled(pVM))
             VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_TSS);
 # endif

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

@@ -38 +38 @@
 
 /**
- * Query HM state (enabled/disabled)
- *
- * @returns @c false if disabled, @c true if enabled.
+ * Checks whether HM (VT-x/AMD-V) is being used by this VM.
+ *
+ * @retval  @c true if used.
+ * @retval  @c false if software virtualization (raw-mode) is used.
  * @param   pVM         The cross context VM structure.
  * @sa      HMIsEnabled, HMR3IsEnabled

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

@@ -87 +87 @@
 #include <VBox/vmm/iom.h>
 #include <VBox/vmm/em.h>
+#include <VBox/vmm/hm.h>
 #include <VBox/vmm/tm.h>
 #include <VBox/vmm/dbgf.h>

trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h

@@ -3417 +3417 @@
                          RT_BOOL(uOldCrX & X86_CR4_VME), RT_BOOL(uNewCrX & X86_CR4_VME) ));
 #ifdef VBOX_WITH_RAW_MODE
-                    VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_TSS);
+                    if (!HMIsEnabled(IEMCPU_TO_VM(pIemCpu)))
+                        VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_TSS);
 #endif
                 }

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

@@ -25 +25 @@
 #include <VBox/vmm/em.h>
 #include <VBox/vmm/mm.h>
+#include <VBox/vmm/hm.h>
 #include <VBox/vmm/pgm.h>
 #include <VBox/vmm/hm.h>
@@ -64 +65 @@
 {
     Assert(pVM->cCpus == 1 && !CPUMIsGuestInLongMode(VMMGetCpu(pVM)));    /* DON'T USE! */
+    Assert(!HMIsEnabled(pVM));
 
     /** @todo check the limit. */
@@ -322 +324 @@
 {
     Assert(!CPUMIsGuestInLongMode(pVCpu));    /* DON'T USE! (Accessing shadow GDT/LDT.) */
+    Assert(!HMIsEnabled(pVCpu->CTX_SUFF(pVM)));
 
     /*
@@ -488 +491 @@
                                                    RTGCPTR GCPtrDesc, RTSEL const Sel, uint32_t const iSReg)
 {
+    Assert(!HMIsEnabled(pVCpu->CTX_SUFF(pVM)));
+
     /*
      * Try read the entry.
@@ -541 +546 @@
     PVM pVM = pVCpu->CTX_SUFF(pVM);
     Assert(pVM->cCpus == 1);
+    Assert(!HMIsEnabled(pVM));
 
 
@@ -634 +640 @@
 {
     NOREF(pVCpu);
+    Assert(!HMIsEnabled(pVM));
+
     /** @todo validate limit! */
     X86DESC    Desc;
@@ -836 +844 @@
 void selmSetRing1Stack(PVM pVM, uint32_t ss, RTGCPTR32 esp)
 {
+    Assert(!HMIsEnabled(pVM));
     Assert((ss & 1) || esp == 0);
     pVM->selm.s.Tss.ss1  = ss;
@@ -852 +861 @@
 void selmSetRing2Stack(PVM pVM, uint32_t ss, RTGCPTR32 esp)
 {
+    Assert(!HMIsEnabled(pVM));
     Assert((ss & 3) == 2 || esp == 0);
     pVM->selm.s.Tss.ss2  = ss;
@@ -858 +868 @@
 #endif
 
-
 #ifdef VBOX_WITH_RAW_MODE_NOT_R0
+
 /**
  * Gets ss:esp for ring1 in main Hypervisor's TSS.
@@ -872 +882 @@
 VMMDECL(int) SELMGetRing1Stack(PVM pVM, uint32_t *pSS, PRTGCPTR32 pEsp)
 {
+    Assert(!HMIsEnabled(pVM));
     Assert(pVM->cCpus == 1);
     PVMCPU pVCpu = &pVM->aCpus[0];
@@ -944 +955 @@
     return VINF_SUCCESS;
 }
-#endif /* VBOX_WITH_RAW_MODE_NOT_R0 */
-
-
-/**
- * Returns Guest TSS pointer
- *
- * @returns Pointer to the guest TSS, RTRCPTR_MAX if not being monitored.
- * @param   pVM     Pointer to the VM.
- */
-VMMDECL(RTGCPTR) SELMGetGuestTSS(PVM pVM)
-{
-    return (RTGCPTR)pVM->selm.s.GCPtrGuestTss;
-}
-
-#ifdef VBOX_WITH_RAW_MODE_NOT_R0
+
 
 /**
@@ -1079 +1076 @@
 VMMDECL(void) SELMShadowCR3Changed(PVM pVM, PVMCPU pVCpu)
 {
-    /** @todo SMP support!! */
+    /** @todo SMP support!! (64-bit guest scenario, primarily) */
     pVM->selm.s.Tss.cr3       = PGMGetHyperCR3(pVCpu);
     pVM->selm.s.TssTrap08.cr3 = PGMGetInterRCCR3(pVM, pVCpu);