Changeset 79380 in vbox for trunk/src/VBox/VMM

Timestamp:

Jun 27, 2019 9:16:35 AM (6 years ago)

Author:

vboxsync

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

131618

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Don't pickup VMCS shadowing control from the outer guest control while merging controls.
We enable/disable VMCS shadowing only while exporting the guest state so it can be left active when we transition from guest to
nested-guest (vmlaunch/vmresume). Currently we do not allow VMCS shadowing to the nested-guest. The alternative fix is to
explicitly disable the VMCS shadowing control on vmlaunch/vmresume VM-exit.
Some assertion adjustments.

File:

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

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

@@ -11068 +11068 @@
                                 | (pVmcsInfoGst->u32ProcCtls2 & ~(  VMX_PROC_CTLS2_VIRT_APIC_ACCESS
                                                                   | VMX_PROC_CTLS2_INVPCID
+                                                                  | VMX_PROC_CTLS2_VMCS_SHADOWING
                                                                   | VMX_PROC_CTLS2_RDTSCP
                                                                   | VMX_PROC_CTLS2_XSAVES_XRSTORS
@@ -14030 +14031 @@
     STAM_PROFILE_ADV_START(&pVCpu->hm.s.StatExitXcptNmi, y3);
 
+    Assert(!pVmxTransient->fIsNestedGuest);
     PVMXVMCSINFO pVmcsInfo = pVmxTransient->pVmcsInfo;
     int rc = hmR0VmxReadExitIntInfoVmcs(pVmxTransient);
@@ -14035 +14037 @@
 
     uint32_t const uIntType = VMX_EXIT_INT_INFO_TYPE(pVmxTransient->uExitIntInfo);
+    Assert(VMX_EXIT_INT_INFO_IS_VALID(pVmxTransient->uExitIntInfo));
     Assert(   !(pVmcsInfo->u32ExitCtls & VMX_EXIT_CTLS_ACK_EXT_INT)
            && uIntType != VMX_EXIT_INT_INFO_TYPE_EXT_INT);
-    Assert(VMX_EXIT_INT_INFO_IS_VALID(pVmxTransient->uExitIntInfo));
 
     if (uIntType == VMX_EXIT_INT_INFO_TYPE_NMI)
@@ -16796 +16798 @@
 
     uint64_t const uExitIntInfo = pVmxTransient->uExitIntInfo;
+    uint32_t const uExtIntType  = VMX_EXIT_INT_INFO_TYPE(uExitIntInfo);
     Assert(VMX_EXIT_INT_INFO_IS_VALID(uExitIntInfo));
-    uint32_t const uExtIntType = VMX_EXIT_INT_INFO_TYPE(uExitIntInfo);
 
     /*
@@ -16810 +16812 @@
         /*
          * Physical NMIs:
-         *    We shouldn't direct host physical NMIs to the nested-guest. Dispatch it to the
-         *    host.
+         *    We shouldn't direct host physical NMIs to the nested-guest. Dispatch it to the host.
          */
         case VMX_EXIT_INT_INFO_TYPE_NMI: