Changeset 73246 in vbox for trunk/include/VBox/vmm

Timestamp:

Jul 19, 2018 3:51:20 PM (7 years ago)

Author:

vboxsync

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

123852

Message:

PGM: Working on eliminating PGMMODEDATA and the corresponding PGMCPU section so we can do mode switching in ring-0. This second part deals with shadow paging pointers and expands PGM_TYPE_NESTED & PGMMODE_NESTED into 32BIT, PAE and AMD64 variants to better map to reality at the expense of a little bit of more code. bugref:9044

Location:

trunk/include/VBox/vmm

Files:

• hm.h (modified) (2 diffs)
• pgm.h (modified) (2 diffs)

trunk/include/VBox/vmm/hm.h

@@ -132 +132 @@
 VMM_INT_DECL(int)               HMAmdIsSubjectToErratum170(uint32_t *pu32Family, uint32_t *pu32Model, uint32_t *pu32Stepping);
 VMM_INT_DECL(bool)              HMSetSingleInstruction(PVM pVM, PVMCPU pVCpu, bool fEnable);
+VMM_INT_DECL(bool)              HMIsSvmActive(PVM pVM);
+VMM_INT_DECL(bool)              HMIsVmxActive(PVM pVM);
 /** @} */
 
@@ -157 +159 @@
 VMM_INT_DECL(bool)              HMIsLongModeAllowed(PVM pVM);
 VMM_INT_DECL(bool)              HMAreMsrBitmapsAvailable(PVM pVM);
-VMM_INT_DECL(PGMMODE)           HMGetShwPagingMode(PVM pVM);
 VMM_INT_DECL(bool)              HMSvmIsVGifActive(PVM pVM);
 VMM_INT_DECL(uint64_t)          HMSvmNstGstApplyTscOffset(PVMCPU pVCpu, uint64_t uTicks);

trunk/include/VBox/vmm/pgm.h

@@ -351 +351 @@
     /** 64-bit AMD paging (long mode) with NX enabled. */
     PGMMODE_AMD64_NX,
-    /** Nested paging mode (shadow only; guest physical to host physical). */
-    PGMMODE_NESTED,
+    /** 32-bit nested paging mode (shadow only; guest physical to host physical). */
+    PGMMODE_NESTED_32BIT,
+    /** PAE nested paging mode (shadow only; guest physical to host physical). */
+    PGMMODE_NESTED_PAE,
+    /** AMD64 nested paging mode (shadow only; guest physical to host physical). */
+    PGMMODE_NESTED_AMD64,
     /** Extended paging (Intel) mode. */
     PGMMODE_EPT,
@@ -371 +375 @@
  */
 #define PGMMODE_IS_LONG_MODE(enmMode) ((enmMode) == PGMMODE_AMD64_NX || (enmMode) == PGMMODE_AMD64)
+
+/** Macro for checking if it's one of the AMD64 nested modes.
+ * @param enmMode   PGMMODE_*.
+ */
+#define PGMMODE_IS_NESTED(enmMode)  (   (enmMode) == PGMMODE_NESTED_32BIT \
+                                     || (enmMode) == PGMMODE_NESTED_PAE \
+                                     || (enmMode) == PGMMODE_NESTED_AMD64)
 
 /**