Changeset 74562 in vbox for trunk

Timestamp:

Oct 2, 2018 4:01:54 AM (7 years ago)

Author:

vboxsync

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

125431

Message:

VMM/IEM: Nested VMX: bugref:9180 VM-exit bits; added function to checking MSR intercepts consulting MSR bitmap if needed.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (4 diffs)

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

@@ -4858 +4858 @@
 
 /**
+ * Checks whether an RDMSR or WRMSR instruction for the given MSR is intercepted
+ * (causes a VM-exit)  or not.
+ *
+ * @returns @c true if the instruction is intercepted, @c false otherwise.
+ * @param   pVCpu           The cross context virtual CPU structure.
+ * @param   uExitReason     The VM-exit exit reason (VMX_EXIT_RDMSR or
+ *                          VMX_EXIT_WRMSR).
+ * @param   idMsr           The MSR.
+ */
+IEM_STATIC bool iemVmxIsRdmsrWrmsrInterceptSet(PVMCPU pVCpu, uint32_t uExitReason, uint32_t idMsr)
+{
+    Assert(IEM_VMX_IS_NON_ROOT_MODE(pVCpu));
+    Assert(   uExitReason == VMX_EXIT_RDMSR
+           || uExitReason == VMX_EXIT_WRMSR);
+
+    /* Consult the MSR bitmap if the feature is supported. */
+    if (IEM_VMX_IS_PROCCTLS_SET(pVCpu, VMX_PROC_CTLS_USE_MSR_BITMAPS))
+    {
+        Assert(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvMsrBitmap));
+        if (uExitReason == VMX_EXIT_RDMSR)
+        {
+            VMXMSREXITREAD enmRead;
+            int rc = HMVmxGetMsrPermission(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvMsrBitmap), idMsr, &enmRead,
+                                           NULL /* penmWrite */);
+            AssertRC(rc);
+            if (enmRead == VMXMSREXIT_INTERCEPT_READ)
+                return true;
+        }
+        else
+        {
+            VMXMSREXITWRITE enmWrite;
+            int rc = HMVmxGetMsrPermission(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvMsrBitmap), idMsr, NULL /* penmRead */,
+                                           &enmWrite);
+            AssertRC(rc);
+            if (enmWrite == VMXMSREXIT_INTERCEPT_WRITE)
+                return true;
+        }
+        return false;
+    }
+
+    /* Without MSR bitmaps, all MSR accesses are intercepted. */
+    return true;
+}
+
+
+/**
  * Checks whether a VMREAD or VMWRITE instruction for the given VMCS field is
  * intercepted (causes a VM-exit) or not.
  *
- * @returns @c true if the intercepted is set, @c false otherwise.
+ * @returns @c true if the instruction is intercepted, @c false otherwise.
  * @param   pVCpu           The cross context virtual CPU structure.
  * @param   u64FieldEnc     The VMCS field encoding.
- * @param   uInstrId        The VM-exit instruction identity (VMXINSTRID_VMREAD or
- *                          VMXINSTRID_VMWRITE).
- */
-IEM_STATIC bool iemVmxIsVmreadVmwriteInterceptSet(PVMCPU pVCpu, uint64_t u64FieldEnc, VMXINSTRID uInstrId)
-{
-    Assert(   uInstrId == VMXINSTRID_VMREAD
-           || uInstrId == VMXINSTRID_VMWRITE);
-
-    /*
-     * Without VMCS shadowing, all VMREAD and VMWRITE instructions are intercepted.
-     */
+ * @param   uExitReason     The VM-exit exit reason (VMX_EXIT_VMREAD or
+ *                          VMX_EXIT_VMREAD).
+ */
+IEM_STATIC bool iemVmxIsVmreadVmwriteInterceptSet(PVMCPU pVCpu, uint32_t uExitReason, uint64_t u64FieldEnc)
+{
+    Assert(IEM_VMX_IS_NON_ROOT_MODE(pVCpu));
+    Assert(   uExitReason == VMX_EXIT_VMREAD
+           || uExitReason == VMX_EXIT_VMWRITE);
+
+    /* Without VMCS shadowing, all VMREAD and VMWRITE instructions are intercepted. */
     if (!IEM_GET_GUEST_CPU_FEATURES(pVCpu)->fVmxVmcsShadowing)
         return true;
@@ -4885 +4930 @@
         return true;
 
-    /*
-     * Finally, consult the VMREAD/VMWRITE bitmap whether to intercept the instruction or not.
-     */
+    /* Finally, consult the VMREAD/VMWRITE bitmap whether to intercept the instruction or not. */
     uint32_t u32FieldEnc = RT_LO_U32(u64FieldEnc);
     Assert(u32FieldEnc >> 3 < VMX_V_VMREAD_VMWRITE_BITMAP_SIZE);
     Assert(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvVmreadBitmap));
-    uint8_t const *pbBitmap = uInstrId == VMXINSTRID_VMREAD
+    uint8_t const *pbBitmap = uExitReason == VMX_EXIT_VMREAD
                             ? (uint8_t const *)pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvVmreadBitmap)
                             : (uint8_t const *)pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvVmwriteBitmap);
@@ -4919 +4962 @@
     /* Nested-guest intercept. */
     if (   IEM_VMX_IS_NON_ROOT_MODE(pVCpu)
-        && iemVmxIsVmreadVmwriteInterceptSet(pVCpu, u64FieldEnc, VMXINSTRID_VMREAD))
+        && iemVmxIsVmreadVmwriteInterceptSet(pVCpu, VMX_EXIT_VMREAD, u64FieldEnc))
     {
         if (pExitInfo)
@@ -5137 +5180 @@
     /* Nested-guest intercept. */
     if (   IEM_VMX_IS_NON_ROOT_MODE(pVCpu)
-        && iemVmxIsVmreadVmwriteInterceptSet(pVCpu, u64FieldEnc, VMXINSTRID_VMWRITE))
+        && iemVmxIsVmreadVmwriteInterceptSet(pVCpu, VMX_EXIT_VMWRITE, u64FieldEnc))
     {
         if (pExitInfo)