Changeset 73773 in vbox for trunk

Timestamp:

Aug 20, 2018 8:04:14 AM (6 years ago)

Author:

vboxsync

Message:

hm_vmx.h: Nested VMX: bugref:9180 VMCS index and encoding are different (going by Intel's terminology).

File:

• trunk/include/VBox/vmm/hm_vmx.h (modified) (19 diffs)

trunk/include/VBox/vmm/hm_vmx.h

@@ -3094 +3094 @@
  *
  * @param   uFieldEnc       VMCS field encoding.
- * @param   u32Val          32-bit value.
+ * @param   u32Val          The 32-bit value to set.
  *
  * @remarks The values of the two status codes can be OR'ed together, the result
@@ -3100 +3100 @@
  */
 #if ((RT_INLINE_ASM_EXTERNAL || !defined(RT_ARCH_X86)) && !VMX_USE_MSC_INTRINSICS)
-DECLASM(int) VMXWriteVmcs32(uint32_t idxField, uint32_t u32Val);
+DECLASM(int) VMXWriteVmcs32(uint32_t uFieldEnc, uint32_t u32Val);
 #else
-DECLINLINE(int) VMXWriteVmcs32(uint32_t idxField, uint32_t u32Val)
+DECLINLINE(int) VMXWriteVmcs32(uint32_t uFieldEnc, uint32_t u32Val)
 {
 # if RT_INLINE_ASM_GNU_STYLE
@@ -3117 +3117 @@
        :"=rm"(rc)
        :"0"(VINF_SUCCESS),
-        "a"(idxField),
+        "a"(uFieldEnc),
         "d"(u32Val)
        );
@@ -3123 +3123 @@
 
 # elif VMX_USE_MSC_INTRINSICS
-     unsigned char rcMsc = __vmx_vmwrite(idxField, u32Val);
+     unsigned char rcMsc = __vmx_vmwrite(uFieldEnc, u32Val);
      if (RT_LIKELY(rcMsc == 0))
          return VINF_SUCCESS;
@@ -3133 +3133 @@
     {
         push   dword ptr [u32Val]
-        mov    eax, [idxField]
+        mov    eax, [uFieldEnc]
         _emit  0x0f
         _emit  0x79
@@ -3161 +3161 @@
  * @retval  VERR_VMX_INVALID_VMCS_FIELD.
  *
- * @param   idxField        VMCS index.
- * @param   u64Val          16, 32 or 64-bit value.
+ * @param   uFieldEnc       The VMCS field encoding.
+ * @param   u64Val          The 16, 32 or 64-bit value to set.
  *
  * @remarks The values of the two status codes can be OR'ed together, the result
@@ -3169 +3169 @@
 #if !defined(RT_ARCH_X86)
 # if !VMX_USE_MSC_INTRINSICS || ARCH_BITS != 64
-DECLASM(int) VMXWriteVmcs64(uint32_t idxField, uint64_t u64Val);
+DECLASM(int) VMXWriteVmcs64(uint32_t uFieldEnc, uint64_t u64Val);
 # else  /* VMX_USE_MSC_INTRINSICS */
-DECLINLINE(int) VMXWriteVmcs64(uint32_t idxField, uint64_t u64Val)
-{
-    unsigned char rcMsc = __vmx_vmwrite(idxField, u64Val);
+DECLINLINE(int) VMXWriteVmcs64(uint32_t uFieldEnc, uint64_t u64Val)
+{
+    unsigned char rcMsc = __vmx_vmwrite(uFieldEnc, u64Val);
     if (RT_LIKELY(rcMsc == 0))
         return VINF_SUCCESS;
@@ -3180 +3180 @@
 # endif /* VMX_USE_MSC_INTRINSICS */
 #else
-# define VMXWriteVmcs64(idxField, u64Val)    VMXWriteVmcs64Ex(pVCpu, idxField, u64Val) /** @todo dead ugly, picking up pVCpu like this */
-VMMR0DECL(int) VMXWriteVmcs64Ex(PVMCPU pVCpu, uint32_t idxField, uint64_t u64Val);
+# define VMXWriteVmcs64(uFieldEnc, u64Val)    VMXWriteVmcs64Ex(pVCpu, uFieldEnc, u64Val) /** @todo dead ugly, picking up pVCpu like this */
+VMMR0DECL(int) VMXWriteVmcs64Ex(PVMCPU pVCpu, uint32_t uFieldEnc, uint64_t u64Val);
 #endif
 
 #if ARCH_BITS == 32
 # define VMXWriteVmcsHstN                       VMXWriteVmcs32
-# define VMXWriteVmcsGstN(idxField, u64Val)     VMXWriteVmcs64Ex(pVCpu, idxField, u64Val)
+# define VMXWriteVmcsGstN(uFieldEnc, u64Val)     VMXWriteVmcs64Ex(pVCpu, uFieldEnc, u64Val)
 #else  /* ARCH_BITS == 64 */
 # define VMXWriteVmcsHstN                       VMXWriteVmcs64
@@ -3214 +3214 @@
 
 /**
- * Executes VMREAD.
+ * Executes VMREAD for a 32-bit field.
  *
  * @returns VBox status code.
@@ -3221 +3221 @@
  * @retval  VERR_VMX_INVALID_VMCS_FIELD.
  *
- * @param   idxField        VMCS index.
- * @param   pData           Where to store VM field value.
+ * @param   uFieldEnc       The VMCS field encoding.
+ * @param   pData           Where to store VMCS field value.
  *
  * @remarks The values of the two status codes can be OR'ed together, the result
@@ -3228 +3228 @@
  */
 #if ((RT_INLINE_ASM_EXTERNAL || !defined(RT_ARCH_X86)) && !VMX_USE_MSC_INTRINSICS)
-DECLASM(int) VMXReadVmcs32(uint32_t idxField, uint32_t *pData);
+DECLASM(int) VMXReadVmcs32(uint32_t uFieldEnc, uint32_t *pData);
 #else
-DECLINLINE(int) VMXReadVmcs32(uint32_t idxField, uint32_t *pData)
+DECLINLINE(int) VMXReadVmcs32(uint32_t uFieldEnc, uint32_t *pData)
 {
 # if RT_INLINE_ASM_GNU_STYLE
@@ -3246 +3246 @@
        :"=&r"(rc),
         "=d"(*pData)
-       :"a"(idxField),
+       :"a"(uFieldEnc),
         "d"(0)
        );
@@ -3254 +3254 @@
     unsigned char rcMsc;
 #  if ARCH_BITS == 32
-    rcMsc = __vmx_vmread(idxField, pData);
+    rcMsc = __vmx_vmread(uFieldEnc, pData);
 #  else
     uint64_t u64Tmp;
-    rcMsc = __vmx_vmread(idxField, &u64Tmp);
+    rcMsc = __vmx_vmread(uFieldEnc, &u64Tmp);
     *pData = (uint32_t)u64Tmp;
 #  endif
@@ -3270 +3270 @@
         sub     esp, 4
         mov     dword ptr [esp], 0
-        mov     eax, [idxField]
+        mov     eax, [uFieldEnc]
         _emit   0x0f
         _emit   0x78
@@ -3292 +3292 @@
 
 /**
- * Executes VMREAD.
+ * Executes VMREAD for a 64-bit field.
  *
  * @returns VBox status code.
@@ -3299 +3299 @@
  * @retval  VERR_VMX_INVALID_VMCS_FIELD.
  *
- * @param   idxField        VMCS index.
- * @param   pData           Where to store VM field value.
+ * @param   uFieldEnc       The VMCS field encoding.
+ * @param   pData           Where to store VMCS field value.
  *
  * @remarks The values of the two status codes can be OR'ed together, the result
@@ -3306 +3306 @@
  */
 #if (!defined(RT_ARCH_X86) && !VMX_USE_MSC_INTRINSICS)
-DECLASM(int) VMXReadVmcs64(uint32_t idxField, uint64_t *pData);
+DECLASM(int) VMXReadVmcs64(uint32_t uFieldEnc, uint64_t *pData);
 #else
-DECLINLINE(int) VMXReadVmcs64(uint32_t idxField, uint64_t *pData)
+DECLINLINE(int) VMXReadVmcs64(uint32_t uFieldEnc, uint64_t *pData)
 {
 # if VMX_USE_MSC_INTRINSICS
@@ -3315 +3315 @@
     size_t        uLow;
     size_t        uHigh;
-    rcMsc  = __vmx_vmread(idxField, &uLow);
-    rcMsc |= __vmx_vmread(idxField + 1, &uHigh);
+    rcMsc  = __vmx_vmread(uFieldEnc, &uLow);
+    rcMsc |= __vmx_vmread(uFieldEnc + 1, &uHigh);
     *pData = RT_MAKE_U64(uLow, uHigh);
 # else
-    rcMsc = __vmx_vmread(idxField, pData);
+    rcMsc = __vmx_vmread(uFieldEnc, pData);
 # endif
     if (RT_LIKELY(rcMsc == 0))
@@ -3328 +3328 @@
     int rc;
     uint32_t val_hi, val;
-    rc  = VMXReadVmcs32(idxField, &val);
-    rc |= VMXReadVmcs32(idxField + 1, &val_hi);
+    rc  = VMXReadVmcs32(uFieldEnc, &val);
+    rc |= VMXReadVmcs32(uFieldEnc + 1, &val_hi);
     AssertRC(rc);
     *pData = RT_MAKE_U64(val, val_hi);