Changeset 87385 in vbox

Timestamp:

Jan 22, 2021 11:03:58 PM (4 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Put VMX_RESTORE_HOST_REQUIRED at the top to simplify check for calling VMXRestoreHostState.

Location:

trunk

Files:

• include/VBox/vmm/hm_vmx.h (modified) (1 diff)
• include/VBox/vmm/hm_vmx.mac (modified) (1 diff)
• src/VBox/VMM/VMMR0/HMR0A.asm (modified) (1 diff)
• src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/hm_vmx.h

@@ -53 +53 @@
 #define VMX_RESTORE_HOST_IDTR                                   RT_BIT(6)
 #define VMX_RESTORE_HOST_GDT_READ_ONLY                          RT_BIT(7)
-#define VMX_RESTORE_HOST_REQUIRED                               RT_BIT(8)
-#define VMX_RESTORE_HOST_GDT_NEED_WRITABLE                      RT_BIT(9)
+#define VMX_RESTORE_HOST_GDT_NEED_WRITABLE                      RT_BIT(8)
+/**
+ * This _must_ be the top most bit, so that we can easily that that it and
+ * something else is set w/o having to do two checks like this:
+ * @code
+ *     if (   (pVCpu->hm.s.vmx.fRestoreHostFlags & VMX_RESTORE_HOST_REQUIRED)
+ *         && (pVCpu->hm.s.vmx.fRestoreHostFlags & ~VMX_RESTORE_HOST_REQUIRED))
+ * @endcode
+ * Instead we can then do:
+ * @code
+ *     if (pVCpu->hm.s.vmx.fRestoreHostFlags > VMX_RESTORE_HOST_REQUIRED)
+ * @endcode
+ */
+#define VMX_RESTORE_HOST_REQUIRED                               RT_BIT(9)
 /** @} */
 

trunk/include/VBox/vmm/hm_vmx.mac

@@ -152 +152 @@
 %define VMX_VMCS_HOST_RIP                                       06C16h
 
-%define VMX_RESTORE_HOST_SEL_DS                                 1h    ;RT_BIT(0)
-%define VMX_RESTORE_HOST_SEL_ES                                 2h    ;RT_BIT(1)
-%define VMX_RESTORE_HOST_SEL_FS                                 4h    ;RT_BIT(2)
-%define VMX_RESTORE_HOST_SEL_GS                                 8h    ;RT_BIT(3)
-%define VMX_RESTORE_HOST_SEL_TR                                 10h   ;RT_BIT(4)
-%define VMX_RESTORE_HOST_GDTR                                   20h   ;RT_BIT(5)
-%define VMX_RESTORE_HOST_IDTR                                   40h   ;RT_BIT(6)
-%define VMX_RESTORE_HOST_GDT_READ_ONLY                          80h   ;RT_BIT(7)
-%define VMX_RESTORE_HOST_REQUIRED                              100h   ;RT_BIT(8)
-%define VMX_RESTORE_HOST_GDT_NEED_WRITABLE                     200h   ;RT_BIT(9)
+%define VMX_RESTORE_HOST_SEL_DS                                 0001h   ;RT_BIT(0)
+%define VMX_RESTORE_HOST_SEL_ES                                 0002h   ;RT_BIT(1)
+%define VMX_RESTORE_HOST_SEL_FS                                 0004h   ;RT_BIT(2)
+%define VMX_RESTORE_HOST_SEL_GS                                 0008h   ;RT_BIT(3)
+%define VMX_RESTORE_HOST_SEL_TR                                 0010h   ;RT_BIT(4)
+%define VMX_RESTORE_HOST_GDTR                                   0020h   ;RT_BIT(5)
+%define VMX_RESTORE_HOST_IDTR                                   0040h   ;RT_BIT(6)
+%define VMX_RESTORE_HOST_GDT_READ_ONLY                          0080h   ;RT_BIT(7)
+%define VMX_RESTORE_HOST_GDT_NEED_WRITABLE                      0100h   ;RT_BIT(8)
+%define VMX_RESTORE_HOST_REQUIRED                               0200h   ;RT_BIT(9) - must be the highest bit!
 
 ;; C version hm_vmx.h.

trunk/src/VBox/VMM/VMMR0/HMR0A.asm

@@ -320 +320 @@
 ; @param   pRestoreHost   x86: [ebp + 0ch]  msc: rdx  gcc: rsi   Pointer to the RestoreHost struct.
 ;
-ALIGNCODE(16)
+ALIGNCODE(64)
 BEGINPROC VMXRestoreHostState
 %ifndef ASM_CALL64_GCC

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -4549 +4549 @@
      * asserting. Was observed booting Solaris 10u10 32-bit guest.
      */
-    if (   (pVCpu->hm.s.vmx.fRestoreHostFlags & VMX_RESTORE_HOST_REQUIRED)
-        && (pVCpu->hm.s.vmx.fRestoreHostFlags & ~VMX_RESTORE_HOST_REQUIRED))
+    if (pVCpu->hm.s.vmx.fRestoreHostFlags > VMX_RESTORE_HOST_REQUIRED)
     {
         Log4Func(("Restoring Host State: fRestoreHostFlags=%#RX32 HostCpuId=%u\n", pVCpu->hm.s.vmx.fRestoreHostFlags,
@@ -8218 +8217 @@
 
     /* Restore host-state bits that VT-x only restores partially. */
-    if (   (pVCpu->hm.s.vmx.fRestoreHostFlags & VMX_RESTORE_HOST_REQUIRED)
-        && (pVCpu->hm.s.vmx.fRestoreHostFlags & ~VMX_RESTORE_HOST_REQUIRED))
+    if (pVCpu->hm.s.vmx.fRestoreHostFlags > VMX_RESTORE_HOST_REQUIRED)
     {
         Log4Func(("Restoring Host State: fRestoreHostFlags=%#RX32 HostCpuId=%u\n", pVCpu->hm.s.vmx.fRestoreHostFlags, idCpu));
@@ -8509 +8507 @@
 
         /* Restore host-state bits that VT-x only restores partially. */
-        if (   (pVCpu->hm.s.vmx.fRestoreHostFlags &  VMX_RESTORE_HOST_REQUIRED)
-            && (pVCpu->hm.s.vmx.fRestoreHostFlags & ~VMX_RESTORE_HOST_REQUIRED))
+        if (pVCpu->hm.s.vmx.fRestoreHostFlags > VMX_RESTORE_HOST_REQUIRED)
             VMXRestoreHostState(pVCpu->hm.s.vmx.fRestoreHostFlags, &pVCpu->hm.s.vmx.RestoreHost);
         pVCpu->hm.s.vmx.fRestoreHostFlags = 0;