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

Timestamp:

Oct 12, 2018 12:25:41 PM (6 years ago)

Author:

vboxsync

Message:

vm.h,VMM: Prep work for 64-bit VMCPU::fLocalForcedActions. Define VMCPU_WITH_64_BIT_FFS to enable. bugref:9180

Location:

trunk/include/VBox/vmm

Files:

• cpum.mac (modified) (1 diff)
• cpumctx.h (modified) (2 diffs)
• vm.h (modified) (9 diffs)

trunk/include/VBox/vmm/cpum.mac

@@ -281 +281 @@
     .hwvirt.svm.HCPhysVmcb             RTHCPHYS_RES  1
     .hwvirt.enmHwvirt                  resd          1
+    .hwvirt.fGif                       resb          1
+    alignb 8
     .hwvirt.fLocalForcedActions        resd          1
-    .hwvirt.fGif                       resb          1
     alignb 64
 endstruc

trunk/include/VBox/vmm/cpumctx.h

@@ -666 +666 @@
         /** 0x3f0 - Hardware virtualization type currently in use. */
         CPUMHWVIRT              enmHwvirt;
-        /** 0x3f4 - A subset of guest force flags that are saved while running the
+        /** 0x3f4 - Global interrupt flag - AMD only (always true on Intel). */
+        bool                    fGif;
+        bool                    afPadding1[3];
+        /** 0x3f8 - A subset of guest force flags that are saved while running the
          *  nested-guest. */
         uint32_t                fLocalForcedActions;
-        /** 0x3f8 - Global interrupt flag - AMD only (always true on Intel). */
-        bool                    fGif;
-        /** 0x3fc - Padding. */
-        uint8_t                 abPadding1[7];
+        uint8_t                 abPadding[4];
     } hwvirt;
     /** @} */
@@ -775 +775 @@
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pvIoBitmapR0,      8);
 AssertCompileMemberOffset(CPUMCTX, hwvirt.enmHwvirt,           0x3f0);
-AssertCompileMemberOffset(CPUMCTX, hwvirt.fLocalForcedActions, 0x3f4);
-AssertCompileMemberOffset(CPUMCTX, hwvirt.fGif,                0x3f8);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.fGif,                0x3f4);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.fLocalForcedActions, 0x3f8);
 AssertCompileMembersAtSameOffset(CPUMCTX, CPUM_UNION_STRUCT_NM(g,qw.) rax, CPUMCTX, CPUM_UNION_NM(g.) aGRegs);
 AssertCompileMembersAtSameOffset(CPUMCTX, CPUM_UNION_STRUCT_NM(g,qw.) rax, CPUMCTX, CPUM_UNION_STRUCT_NM(g,qw2.)  r0);

trunk/include/VBox/vmm/vm.h

@@ -103 +103 @@
     /** Per CPU forced action.
      * See the VMCPU_FF_* \#defines. Updated atomically. */
+#ifdef VMCPU_WITH_64_BIT_FFS
+    uint64_t volatile       fLocalForcedActions;
+#else
     uint32_t volatile       fLocalForcedActions;
     uint32_t                fForLocalForcedActionsExpansion;
+#endif
     /** The CPU state. */
     VMCPUSTATE volatile     enmState;
@@ -675 +679 @@
  * @sa      VMCPU_FF_SET_MASK
  */
-#define VMCPU_FF_SET(pVCpu, fFlag) do { \
+#ifdef VMCPU_WITH_64_BIT_FFS
+# define VMCPU_FF_SET(pVCpu, fFlag) do { \
+        AssertCompile(RT_IS_POWER_OF_TWO(fFlag)); \
+        AssertCompile((fFlag) == RT_BIT_32(fFlag##_BIT)); \
+        ASMAtomicBitSet(&(pVCpu)->fLocalForcedActions, fFlag##_BIT); \
+    } while (0)
+#else
+# define VMCPU_FF_SET(pVCpu, fFlag) do { \
         AssertCompile(RT_IS_POWER_OF_TWO(fFlag)); \
         AssertCompile((fFlag) == RT_BIT_32(fFlag##_BIT)); \
         ASMAtomicOrU32(&(pVCpu)->fLocalForcedActions, (fFlag)); \
     } while (0)
+#endif
 
 /** @def VMCPU_FF_SET_MASK
@@ -688 +700 @@
  * @sa      VMCPU_FF_SET
  */
-#define VMCPU_FF_SET_MASK(a_pVCpu, fFlags) \
+#ifdef VMCPU_WITH_64_BIT_FFS
+# if ARCH_BITS > 32
+#  define VMCPU_FF_SET_MASK(a_pVCpu, fFlags) \
+    do { ASMAtomicOrU64(&a_pVCpu->fLocalForcedActions, (fFlags)); } while (0)
+# else
+#  define VMCPU_FF_SET_MASK(a_pVCpu, fFlags) do { \
+        if (!((fFlags) >> 32)) ASMAtomicOrU32((uint32_t volatile *)&a_pVCpu->fLocalForcedActions, (uint32_t)(fFlags)); \
+        else ASMAtomicOrU64(&a_pVCpu->fLocalForcedActions, (fFlags)); \
+    } while (0)
+# endif
+#else
+# define VMCPU_FF_SET_MASK(a_pVCpu, fFlags) \
     do { ASMAtomicOrU32(&a_pVCpu->fLocalForcedActions, (fFlags)); } while (0)
+#endif
 
 /** @def VM_FF_CLEAR
@@ -709 +733 @@
  * @param   fFlag   The flag to clear.
  */
-#define VMCPU_FF_CLEAR(pVCpu, fFlag) do { \
+#ifdef VMCPU_WITH_64_BIT_FFS
+# define VMCPU_FF_CLEAR(pVCpu, fFlag) do { \
+        AssertCompile(RT_IS_POWER_OF_TWO(fFlag)); \
+        AssertCompile((fFlag) == RT_BIT_32(fFlag##_BIT)); \
+        ASMAtomicBitClear(&(pVCpu)->fLocalForcedActions, fFlag##_BIT); \
+    } while (0)
+#else
+# define VMCPU_FF_CLEAR(pVCpu, fFlag) do { \
         AssertCompile(RT_IS_POWER_OF_TWO(fFlag)); \
         AssertCompile((fFlag) == RT_BIT_32(fFlag##_BIT)); \
         ASMAtomicAndU32(&(pVCpu)->fLocalForcedActions, ~(fFlag)); \
     } while (0)
+#endif
 
 /** @def VMCPU_FF_CLEAR_MASK
@@ -721 +753 @@
  * @param   fFlags  The flags to clear.
  */
-#define VMCPU_FF_CLEAR_MASK(pVCpu, fFlags) \
+#ifdef VMCPU_WITH_64_BIT_FFS
+# if ARCH_BITS > 32
+# define VMCPU_FF_CLEAR_MASK(pVCpu, fFlags) \
+    do { ASMAtomicAndU64(&(pVCpu)->fLocalForcedActions, ~(fFlags)); } while (0)
+# else
+# define VMCPU_FF_CLEAR_MASK(pVCpu, fFlags) do { \
+        if (!((fFlags) >> 32)) ASMAtomicAndU32((uint32_t volatile *)&(pVCpu)->fLocalForcedActions, ~(uint32_t)(fFlags)); \
+        else ASMAtomicAndU64(&(pVCpu)->fLocalForcedActions, ~(fFlags)); \
+    } while (0)
+# endif
+#else
+# define VMCPU_FF_CLEAR_MASK(pVCpu, fFlags) \
     do { ASMAtomicAndU32(&(pVCpu)->fLocalForcedActions, ~(fFlags)); } while (0)
+#endif
 
 /** @def VM_FF_IS_SET
@@ -732 +776 @@
  */
 #if !defined(VBOX_STRICT) || !defined(RT_COMPILER_SUPPORTS_LAMBDA)
-# define VM_FF_IS_SET(pVM, fFlag)           (((pVM)->fGlobalForcedActions & (fFlag)) == (fFlag))
+# define VM_FF_IS_SET(pVM, fFlag)           RT_BOOL((pVM)->fGlobalForcedActions & (fFlag))
 #else
 # define VM_FF_IS_SET(pVM, fFlag) \
@@ -739 +783 @@
         AssertCompile(RT_IS_POWER_OF_TWO(fFlag)); \
         AssertCompile((fFlag) == RT_BIT_32(fFlag##_BIT)); \
-        return (a_pVM->fGlobalForcedActions & (fFlag)) == (fFlag); \
+        return RT_BOOL(a_pVM->fGlobalForcedActions & (fFlag)); \
     }(pVM))
 #endif
@@ -751 +795 @@
  */
 #if !defined(VBOX_STRICT) || !defined(RT_COMPILER_SUPPORTS_LAMBDA)
-# define VMCPU_FF_IS_SET(pVCpu, fFlag)      (((pVCpu)->fLocalForcedActions & (fFlag)) == (fFlag))
+# define VMCPU_FF_IS_SET(pVCpu, fFlag)      RT_BOOL((pVCpu)->fLocalForcedActions & (fFlag))
 #else
 # define VMCPU_FF_IS_SET(pVCpu, fFlag) \
@@ -758 +802 @@
         AssertCompile(RT_IS_POWER_OF_TWO(fFlag)); \
         AssertCompile((fFlag) == RT_BIT_32(fFlag##_BIT)); \
-        return (a_pVCpu->fLocalForcedActions & (fFlag)) == (fFlag); \
+        return RT_BOOL(a_pVCpu->fLocalForcedActions & (fFlag)); \
     }(pVCpu))
 #endif