Changeset 79402 in vbox for trunk/src/VBox

Timestamp:

Jun 28, 2019 7:49:36 AM (6 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Refer to the host CPU capability while choosing to map the APIC-access page (since we don't allow physical APIC access to the guest or the nested-guest).
Look at the VMCSINFO control directly when looking at VMX_PROC_CTLS_USE_MSR_BITMAPS in hmR0VmxExitRdmsr since nested-guest has its own handler.
Commented out a couple of functions as a result.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (6 diffs)

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

@@ -1004 +1004 @@
 
 
+#if 0
 /**
  * Checks whether one of the given Processor-based VM-execution controls are set.
@@ -1050 +1051 @@
 
 
-#if 0
 /**
  * Checks whether one of the given VM-entry controls are set.
@@ -11400 +11400 @@
     PVM pVM = pVCpu->CTX_SUFF(pVM);
     if (   !pVCpu->hm.s.vmx.u64GstMsrApicBase
-        && hmR0VmxIsProcCtls2Set(pVCpu, pVmxTransient, VMX_PROC_CTLS2_VIRT_APIC_ACCESS)
+        && (pVM->hm.s.vmx.Msrs.ProcCtls2.n.allowed1 & VMX_PROC_CTLS2_VIRT_APIC_ACCESS)
         && PDMHasApic(pVM))
     {
@@ -13881 +13881 @@
          * etc.) occurred while delivering the NMI, we need to clear the block-by-NMI field in the guest
          * interruptibility-state before re-delivering the NMI after handling the VM-exit. Otherwise the
-         * subsequent VM-entry would fail.
+         * subsequent VM-entry would fail, see @bugref{7445}.
          *
-         * See Intel spec. 30.7.1.2 "Resuming Guest Software after Handling an Exception". See @bugref{7445}.
+         * See Intel spec. 30.7.1.2 "Resuming Guest Software after Handling an Exception".
          */
         if (   uIdtVectorType == VMX_IDT_VECTORING_INFO_TYPE_NMI
@@ -14786 +14786 @@
 
 #ifdef VBOX_STRICT
-    if (hmR0VmxIsProcCtlsSet(pVCpu, pVmxTransient, VMX_PROC_CTLS_USE_MSR_BITMAPS))
+    Assert(!pVmxTransient->fIsNestedGuest);
+    if (pVmcsInfo->u32ProcCtls & VMX_PROC_CTLS_USE_MSR_BITMAPS)
     {
         if (   hmR0VmxIsAutoLoadGuestMsr(pVmcsInfo, idMsr)
@@ -14888 +14889 @@
         }
 
-        /* Update MSRs that are part of the VMCS and auto-load/store area when MSR-bitmaps are not supported. */
-        if (!hmR0VmxIsProcCtlsSet(pVCpu, pVmxTransient, VMX_PROC_CTLS_USE_MSR_BITMAPS))
+        /* Update MSRs that are part of the VMCS and auto-load/store area when MSR-bitmaps are not used. */
+        if (!(pVmcsInfo->u32ProcCtls & VMX_PROC_CTLS_USE_MSR_BITMAPS))
         {
             switch (idMsr)