Changeset 74566 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Oct 2, 2018 6:01:50 AM (6 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:9180 VM-exit bits; Add INVPCID intercept.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h

@@ -5985 +5985 @@
     if (!IEM_GET_GUEST_CPU_FEATURES(pVCpu)->fInvpcid)
         return iemRaiseUndefinedOpcode(pVCpu);
+
+    /* When in VMX non-root mode and INVPCID is not enabled, it results in #UD. */
+    if (    IEM_VMX_IS_NON_ROOT_MODE(pVCpu)
+        && !IEM_VMX_IS_PROCCTLS2_SET(pVCpu, VMX_PROC_CTLS2_INVPCID))
+    {
+        Log(("invpcid: Not enabled for nested-guest execution -> #UD\n"));
+        return iemRaiseUndefinedOpcode(pVCpu);
+    }
+
     if (pVCpu->iem.s.uCpl != 0)
     {
@@ -5990 +5999 @@
         return iemRaiseGeneralProtectionFault0(pVCpu);
     }
+
     if (IEM_IS_V86_MODE(pVCpu))
     {
@@ -5995 +6005 @@
         return iemRaiseGeneralProtectionFault0(pVCpu);
     }
+
+    /*
+     * Check nested-guest intercept.
+     *
+     * INVPCID causes a VM-exit if "enable INVPCID" and "INVLPG exiting" are
+     * both set. We have already checked the former earlier in this function.
+     *
+     * CPL checks take priority over VM-exit.
+     * See Intel spec. "25.1.1 Relative Priority of Faults and VM Exits".
+     */
+    /** @todo r=ramshankar: NSTVMX: I'm not entirely certain if V86 mode check has
+     *        higher or lower priority than a VM-exit, we assume higher for the time
+     *        being. */
+    if (IEM_VMX_IS_PROCCTLS_SET(pVCpu, VMX_PROC_CTLS_INVLPG_EXIT))
+    {
+        Log(("invpcid: Guest intercept -> #VM-exit\n"));
+        IEM_VMX_VMEXIT_INSTR_NEEDS_INFO_RET(pVCpu, VMX_EXIT_INVPCID, VMXINSTRID_NONE, cbInstr);
+    }
+
     if (uInvpcidType > X86_INVPCID_TYPE_MAX_VALID)
     {