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

Timestamp:

Jun 18, 2014 11:06:06 AM (11 years ago)

Author:

vboxsync

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

94404

Message:

VMM/GIM: More bits for Hyper-V implementation.

Location:

trunk/include/VBox/vmm

Files:

• gim.h (modified) (5 diffs)
• hm_vmx.h (modified) (7 diffs)
• tm.h (modified) (1 diff)
• vm.h (modified) (2 diffs)
• vm.mac (modified) (1 diff)

trunk/include/VBox/vmm/gim.h

@@ -57 +57 @@
     GIMPROVIDERID_KVM
 } GIMPROVIDERID;
-AssertCompileSize(GIMPROVIDERID, 4);
+AssertCompileSize(GIMPROVIDERID, sizeof(uint32_t));
 
 
@@ -74 +74 @@
     bool                fMapped;
     /** Alignment padding. */
-    uint8_t             au8Alignment0[4];
+    uint8_t             au8Alignment0[3];
     /** Size of the region (must be page aligned). */
     uint32_t            cbRegion;
@@ -94 +94 @@
 /** Pointer to a const GIM MMIO2 region. */
 typedef GIMMMIO2REGION const *PCGIMMMIO2REGION;
-AssertCompileMemberAlignment(GIMMMIO2REGION, cbRegion,   8);
-AssertCompileMemberAlignment(GIMMMIO2REGION, pvPageR0,   8);
+AssertCompileMemberAlignment(GIMMMIO2REGION, cbRegion, 8);
+AssertCompileMemberAlignment(GIMMMIO2REGION, pvPageR0, 8);
 
 
@@ -153 +153 @@
 VMMR0_INT_DECL(int)         GIMR0InitVM(PVM pVM);
 VMMR0_INT_DECL(int)         GIMR0TermVM(PVM pVM);
+VMMR0_INT_DECL(int)         GIMR0UpdateParavirtTsc(PVM pVM, uint64_t u64Offset);
 /** @} */
 #endif /* IN_RING0 */
@@ -171 +172 @@
 
 VMMDECL(bool)               GIMIsEnabled(PVM pVM);
-VMMDECL(int)                GIMUpdateParavirtTsc(PVM pVM, uint64_t u64Offset);
+VMMDECL(GIMPROVIDERID)      GIMGetProvider(PVM pVM);
 VMMDECL(bool)               GIMIsParavirtTscEnabled(PVM pVM);
 VMM_INT_DECL(int)           GIMHypercall(PVMCPU pVCpu, PCPUMCTX pCtx);

trunk/include/VBox/vmm/hm_vmx.h

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -134 +134 @@
 AssertCompileMemberOffset(VMXRESTOREHOST, uHostFSBase,    40);
 AssertCompileSize(VMXRESTOREHOST, 56);
+AssertCompileSizeAlignment(VMXRESTOREHOST, 8);
 
 /** @name Host-state MSR lazy-restoration flags.
@@ -779 +780 @@
 typedef const EPTPT *PCEPTPT;
 
-/**
- * VPID flush types.
+/** @name VMX VPID flush types.
+ *  Warning!! Valid enum members are in accordance to the VT-x spec.
+ * @{
  */
 typedef enum
 {
     /** Invalidate a specific page. */
-    VMX_FLUSH_VPID_INDIV_ADDR                    = 0,
+    VMXFLUSHVPID_INDIV_ADDR                    = 0,
     /** Invalidate one context (specific VPID). */
-    VMX_FLUSH_VPID_SINGLE_CONTEXT                = 1,
+    VMXFLUSHVPID_SINGLE_CONTEXT                = 1,
     /** Invalidate all contexts (all VPIDs). */
-    VMX_FLUSH_VPID_ALL_CONTEXTS                  = 2,
+    VMXFLUSHVPID_ALL_CONTEXTS                  = 2,
     /** Invalidate a single VPID context retaining global mappings. */
-    VMX_FLUSH_VPID_SINGLE_CONTEXT_RETAIN_GLOBALS = 3,
+    VMXFLUSHVPID_SINGLE_CONTEXT_RETAIN_GLOBALS = 3,
     /** Unsupported by VirtualBox. */
-    VMX_FLUSH_VPID_NOT_SUPPORTED                 = 0xbad,
+    VMXFLUSHVPID_NOT_SUPPORTED                 = 0xbad0,
     /** Unsupported by CPU. */
-    VMX_FLUSH_VPID_NONE                          = 0xb00,
-    /** 32bit hackishness. */
-    VMX_FLUSH_VPID_32BIT_HACK                    = 0x7fffffff
-} VMX_FLUSH_VPID;
-
-/**
- * EPT flush types.
+    VMXFLUSHVPID_NONE                          = 0xbad1
+} VMXFLUSHVPID;
+AssertCompileSize(VMXFLUSHVPID, 4);
+/** @} */
+
+/** @name VMX EPT flush types.
+ *  Warning!! Valid enums values below are in accordance to the VT-x spec.
+ * @{
  */
 typedef enum
 {
     /** Invalidate one context (specific EPT). */
-    VMX_FLUSH_EPT_SINGLE_CONTEXT                = 1,
+    VMXFLUSHEPT_SINGLE_CONTEXT                 = 1,
     /* Invalidate all contexts (all EPTs) */
-    VMX_FLUSH_EPT_ALL_CONTEXTS                  = 2,
+    VMXFLUSHEPT_ALL_CONTEXTS                   = 2,
     /** Unsupported by VirtualBox.   */
-    VMX_FLUSH_EPT_NOT_SUPPORTED                 = 0xbad,
+    VMXFLUSHEPT_NOT_SUPPORTED                  = 0xbad0,
     /** Unsupported by CPU. */
-    VMX_FLUSH_EPT_NONE                          = 0xb00,
-    /** 32bit hackishness. */
-    VMX_FLUSH_EPT_32BIT_HACK                    = 0x7fffffff
-} VMX_FLUSH_EPT;
-/** @} */
-
-/** @name MSR autoload/store elements
+    VMXFLUSHEPT_NONE                           = 0xbad1
+} VMXFLUSHEPT;
+AssertCompileSize(VMXFLUSHEPT, 4);
+/** @} */
+
+/** @name VMX MSR autoload/store element.
+ *  In accordance to VT-x spec.
  * @{
  */
@@ -824 +827 @@
 typedef struct
 {
+    /** The MSR Id. */
     uint32_t    u32Msr;
+    /** Reserved (MBZ). */
     uint32_t    u32Reserved;
+    /** The MSR value. */
     uint64_t    u64Value;
 } VMXAUTOMSR;
@@ -877 +883 @@
 /** Pointer to a VMXMSRS struct. */
 typedef VMXMSRS *PVMXMSRS;
+AssertCompileSizeAlignment(VMXMSRS, 8);
 /** @} */
 
@@ -2188 +2195 @@
  * @param   pDescriptor Descriptor
  */
-DECLASM(int) VMXR0InvEPT(VMX_FLUSH_EPT enmFlush, uint64_t *pDescriptor);
+DECLASM(int) VMXR0InvEPT(VMXFLUSHEPT enmFlush, uint64_t *pDescriptor);
 
 /**
@@ -2196 +2203 @@
  * @param   pDescriptor Descriptor
  */
-DECLASM(int) VMXR0InvVPID(VMX_FLUSH_VPID enmFlush, uint64_t *pDescriptor);
+DECLASM(int) VMXR0InvVPID(VMXFLUSHVPID enmFlush, uint64_t *pDescriptor);
 
 /**

trunk/include/VBox/vmm/tm.h

@@ -133 +133 @@
 VMMDECL(uint64_t)       TMCpuTickGet(PVMCPU pVCpu);
 VMM_INT_DECL(uint64_t)  TMCpuTickGetNoCheck(PVMCPU pVCpu);
-VMM_INT_DECL(bool)      TMCpuTickCanUseRealTSC(PVMCPU pVCpu, uint64_t *poffRealTSC);
-VMM_INT_DECL(uint64_t)  TMCpuTickGetDeadlineAndTscOffset(PVMCPU pVCpu, bool *pfOffsettedTsc, uint64_t *poffRealTSC);
+VMM_INT_DECL(bool)      TMCpuTickCanUseRealTSC(PVMCPU pVCpu, uint64_t *poffRealTSC, bool *pfParavirtTsc);
+VMM_INT_DECL(uint64_t)  TMCpuTickGetDeadlineAndTscOffset(PVMCPU pVCpu, bool *pfOffsettedTsc, bool *pfParavirtTsc, uint64_t *poffRealTSC);
 VMM_INT_DECL(int)       TMCpuTickSet(PVM pVM, PVMCPU pVCpu, uint64_t u64Tick);
 VMM_INT_DECL(int)       TMCpuTickSetLastSeen(PVMCPU pVCpu, uint64_t u64LastSeenTick);

trunk/include/VBox/vmm/vm.h

@@ -149 +149 @@
         struct HMCPU    s;
 #endif
-        uint8_t             padding[5632];      /* multiple of 64 */
+        uint8_t             padding[5696];      /* multiple of 64 */
     } hm;
 
@@ -235 +235 @@
 
     /** Align the following members on page boundary. */
-    uint8_t                 abAlignment2[64];
+    //uint8_t                 abAlignment2[64];
 
     /** PGM part. */

trunk/include/VBox/vmm/vm.mac

@@ -135 +135 @@
 
     .cpum                   resb 3584
-    .hm                     resb 5632
+    .hm                     resb 5696
     .em                     resb 1472
     .iem                    resb 3072