Changeset 48649 in vbox for trunk

Timestamp:

Sep 24, 2013 9:05:56 AM (11 years ago)

Author:

vboxsync

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

89247

Message:

VMM/HMVMXR0: VMCS size is bits 44:32 not 43:32. Assert what the Intel spec. claims as well.

Location:

trunk

Files:

• include/VBox/vmm/hm_vmx.h (modified) (2 diffs)
• src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (1 diff)

trunk/include/VBox/vmm/hm_vmx.h

@@ -115 +115 @@
  *  for storing guest MSRs. */
 #define VMX_UFC_INSUFFICIENT_GUEST_MSR_STORAGE                  6
+/** Invalid VMCS size. */
+#define VMX_UFC_INVALID_VMCS_SIZE                               7
 /** @} */
 
@@ -1079 +1081 @@
 #define MSR_IA32_VMX_BASIC_INFO_VMCS_ID(a)                      ((a) & 0x7FFFFFFF)
 /** Size of the VMCS. */
-#define MSR_IA32_VMX_BASIC_INFO_VMCS_SIZE(a)                    (((a) >> 32) & 0xFFF)
+#define MSR_IA32_VMX_BASIC_INFO_VMCS_SIZE(a)                    (((a) >> 32) & 0x1FFF)
 /** Width of physical address used for the VMCS.
  *  0 -> limited to the available amount of physical ram

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

@@ -945 +945 @@
         AssertPtr(pVCpu);
 
+        /* The VMCS size cannot be more than 4096 bytes. See Intel spec. Appendix A.1 "Basic VMX Information". */
+        AssertReturnStmt(MSR_IA32_VMX_BASIC_INFO_VMCS_SIZE(pVM->hm.s.vmx.Msrs.u64BasicInfo) <= PAGE_SIZE,
+                         pVCpu->hm.s.u32HMError = VMX_UFC_INVALID_VMCS_SIZE,
+                         VERR_HM_UNSUPPORTED_CPU_FEATURE_COMBO);
+
         /* Allocate the VM control structure (VMCS). */
-        AssertReturn(MSR_IA32_VMX_BASIC_INFO_VMCS_SIZE(pVM->hm.s.vmx.Msrs.u64BasicInfo) <= PAGE_SIZE, VERR_INTERNAL_ERROR);
         rc = hmR0VmxPageAllocZ(&pVCpu->hm.s.vmx.hMemObjVmcs, &pVCpu->hm.s.vmx.pvVmcs, &pVCpu->hm.s.vmx.HCPhysVmcs);
         if (RT_FAILURE(rc))