Changeset 71640 in vbox

Timestamp:

Apr 4, 2018 6:30:54 AM (7 years ago)

Author:

vboxsync

Message:

VMM: Nested hw.virt: Abstract SVM V_INTR_MASKING so we can refer to the original VMCB value rather than a potentially modified
value while executing the nested-guest in hardware-assisted SVM.

Location:

trunk

Files:

• include/VBox/vmm/cpum.h (modified) (3 diffs)
• include/VBox/vmm/hm_svm.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/HMSVMAll.cpp (modified) (1 diff)

trunk/include/VBox/vmm/cpum.h

@@ -1468 +1468 @@
  *
  * @returns @c true if in intercept is active, @c false otherwise.
- * @param   pVCpu   The cross context virtual CPU structure of the calling EMT.
+ * @param   pVCpu       The cross context virtual CPU structure of the calling EMT.
  * @param   pCtx        Pointer to the context.
  * @param   uVector     The exception / interrupt vector.
@@ -1483 +1483 @@
 }
 
+
+/**
+ * Checks if the guest VMCB has virtual-interrupt masking enabled.
+ *
+ * @returns @c true if virtual-interrupts are masked, @c false otherwise.
+ * @param   pVCpu       The cross context virtual CPU structure of the calling EMT.
+ * @param   pCtx        Pointer to the context.
+ *
+ * @remarks Should only be called when SVM feature is exposed to the guest.
+ */
+DECLINLINE(bool) CPUMIsGuestSvmVirtIntrMasking(PVMCPU pVCpu, PCCPUMCTX pCtx)
+{
+    PCSVMVMCB pVmcb = pCtx->hwvirt.svm.CTX_SUFF(pVmcb);
+    Assert(pVmcb);
+    if (!pCtx->hwvirt.svm.fHMCachedVmcb)
+    {
+        PCSVMVMCBCTRL pVmcbCtrl = &pCtx->hwvirt.svm.CTX_SUFF(pVmcb)->ctrl;
+        return pVmcbCtrl->IntCtrl.n.u1VIntrMasking;
+    }
+    return HMIsGuestSvmVirtIntrMasking(pVCpu, pCtx);
+}
+
+
 /**
  * Updates the NextRIP (NRIP) field in the nested-guest VMCB.
@@ -1489 +1512 @@
  * @param   pCtx        Pointer to the context.
  * @param   cbInstr     The length of the current instruction in bytes.
+ *
+ * @remarks Should only be called when SVM feature is exposed to the guest.
  */
 DECLINLINE(void) CPUMGuestSvmUpdateNRip(PVMCPU pVCpu, PCCPUMCTX pCtx, uint8_t cbInstr)

trunk/include/VBox/vmm/hm_svm.h

@@ -1137 +1137 @@
 VMM_INT_DECL(bool) HMIsGuestSvmWriteDRxInterceptSet(PVMCPU pVCpu, PCCPUMCTX pCtx, uint8_t uDr);
 VMM_INT_DECL(bool) HMIsGuestSvmXcptInterceptSet(PVMCPU pVCpu, PCCPUMCTX pCtx, uint8_t uVector);
+VMM_INT_DECL(bool) HMIsGuestSvmVirtIntrMasking(PVMCPU pVCpu, PCCPUMCTX pCtx);
 VMM_INT_DECL(bool) HMCanSvmNstGstTakePhysIntr(PVMCPU pVCpu, PCCPUMCTX pCtx);
 VMM_INT_DECL(bool) HMCanSvmNstGstTakeVirtIntr(PVMCPU pVCpu, PCCPUMCTX pCtx);

trunk/src/VBox/VMM/VMMAll/HMSVMAll.cpp

@@ -543 +543 @@
 
 /**
+ * Checks if the guest VMCB has virtual-interrupts masking enabled.
+ *
+ * @returns true if virtual-interrupts are masked, @c false otherwise.
+ * @param   pVCpu   The cross context virtual CPU structure of the calling EMT.
+ * @param   pCtx    Pointer to the context.
+ */
+VMM_INT_DECL(bool) HMIsGuestSvmVirtIntrMasking(PVMCPU pVCpu, PCCPUMCTX pCtx)
+{
+    Assert(pCtx->hwvirt.svm.fHMCachedVmcb); NOREF(pCtx);
+    PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
+    return pVmcbNstGstCache->fVIntrMasking;
+}
+
+
+/**
  * Checks whether the SVM nested-guest is in a state to receive physical (APIC)
  * interrupts.