Changeset 71908 in vbox for trunk/src/VBox

Timestamp:

Apr 19, 2018 5:13:28 AM (7 years ago)

Author:

vboxsync

Message:

VMM/HMSVMR0: Cleanup, for using up next added if 0'd set/clear functions for control intercepts.

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (7 diffs)

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

@@ -1371 +1371 @@
 
 /**
- * Adds an exception to the intercept exception bitmap in the VMCB and updates
- * the corresponding VMCB Clean bit.
+ * Sets an exception intercept in the specified VMCB.
  *
  * @param   pVmcb       Pointer to the VM control block.
- * @param   u32Xcpt     The value of the exception (X86_XCPT_*).
- */
-DECLINLINE(void) hmR0SvmAddXcptIntercept(PSVMVMCB pVmcb, uint32_t u32Xcpt)
-{
-    if (!(pVmcb->ctrl.u32InterceptXcpt & RT_BIT(u32Xcpt)))
-    {
-        pVmcb->ctrl.u32InterceptXcpt |= RT_BIT(u32Xcpt);
+ * @param   uXcpt       The exception (X86_XCPT_*).
+ */
+DECLINLINE(void) hmR0SvmSetXcptIntercept(PSVMVMCB pVmcb, uint8_t uXcpt)
+{
+    if (!(pVmcb->ctrl.u32InterceptXcpt & RT_BIT(uXcpt)))
+    {
+        pVmcb->ctrl.u32InterceptXcpt |= RT_BIT(uXcpt);
         pVmcb->ctrl.u32VmcbCleanBits &= ~HMSVM_VMCB_CLEAN_INTERCEPTS;
     }
@@ -1388 +1387 @@
 
 /**
- * Removes an exception from the intercept-exception bitmap in the VMCB and
- * updates the corresponding VMCB Clean bit.
+ * Clears an exception intercept in the specified VMCB.
  *
  * @param   pVCpu       The cross context virtual CPU structure.
  * @param   pCtx        Pointer to the guest-CPU context.
  * @param   pVmcb       Pointer to the VM control block.
- * @param   u32Xcpt     The value of the exception (X86_XCPT_*).
+ * @param   uXcpt       The exception (X86_XCPT_*).
  *
  * @remarks This takes into account if we're executing a nested-guest and only
@@ -1400 +1398 @@
  *          are not intercepting it.
  */
-DECLINLINE(void) hmR0SvmRemoveXcptIntercept(PVMCPU pVCpu, PCPUMCTX pCtx, PSVMVMCB pVmcb, uint32_t u32Xcpt)
-{
-    Assert(u32Xcpt != X86_XCPT_DB);
-    Assert(u32Xcpt != X86_XCPT_AC);
+DECLINLINE(void) hmR0SvmClearXcptIntercept(PVMCPU pVCpu, PCPUMCTX pCtx, PSVMVMCB pVmcb, uint8_t uXcpt)
+{
+    Assert(uXcpt != X86_XCPT_DB);
+    Assert(uXcpt != X86_XCPT_AC);
 #ifndef HMSVM_ALWAYS_TRAP_ALL_XCPTS
-    if (pVmcb->ctrl.u32InterceptXcpt & RT_BIT(u32Xcpt))
-    {
-        bool fRemoveXcpt = true;
+    if (pVmcb->ctrl.u32InterceptXcpt & RT_BIT(uXcpt))
+    {
+        bool fRemove = true;
 #ifdef VBOX_WITH_NESTED_HWVIRT
         /* Only remove the intercept if the nested-guest is also not intercepting it! */
@@ -1413 +1411 @@
         {
             PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = hmR0SvmGetNestedVmcbCache(pVCpu, pCtx);
-            fRemoveXcpt = !(pVmcbNstGstCache->u32InterceptXcpt & RT_BIT(u32Xcpt));
+            fRemove = !(pVmcbNstGstCache->u32InterceptXcpt & RT_BIT(uXcpt));
         }
 #else
         RT_NOREF2(pVCpu, pCtx);
 #endif
-        if (fRemoveXcpt)
-        {
-            pVmcb->ctrl.u32InterceptXcpt &= ~RT_BIT(u32Xcpt);
+        if (fRemove)
+        {
+            pVmcb->ctrl.u32InterceptXcpt &= ~RT_BIT(uXcpt);
             pVmcb->ctrl.u32VmcbCleanBits &= ~HMSVM_VMCB_CLEAN_INTERCEPTS;
         }
@@ -1429 +1427 @@
 }
 
+#if 0
+/**
+ * Sets a control intercept in the specified VMCB.
+ *
+ * @param   pVmcb           Pointer to the VM control block.
+ * @param   fCtrlIntercept  The control intercept (SVM_CTRL_INTERCEPT_*).
+ */
+DECLINLINE(void) hmR0SvmSetCtrlIntercept(PSVMVMCB pVmcb, uint64_t fCtrlIntercept)
+{
+    if (!(pVmcb->ctrl.u64InterceptCtrl & fCtrlIntercept))
+    {
+        pVmcb->ctrl.u64InterceptCtrl |= fCtrlIntercept;
+        pVmcb->ctrl.u32VmcbCleanBits &= ~HMSVM_VMCB_CLEAN_INTERCEPTS;
+    }
+}
+
+
+/**
+ * Clears a control intercept in the specified VMCB.
+ *
+ * @param   pVCpu           The cross context virtual CPU structure.
+ * @param   pCtx            Pointer to the guest-CPU context.
+ * @param   pVmcb           Pointer to the VM control block.
+ * @param   fCtrlIntercept  The control intercept (SVM_CTRL_INTERCEPT_*).
+ *
+ * @remarks This takes into account if we're executing a nested-guest and only
+ *          removes the control intercept if both the guest -and- nested-guest
+ *          are not intercepting it.
+ */
+DECLINLINE(void) hmR0SvmClearCtrlIntercept(PVMCPU pVCpu, PCPUMCTX pCtx, PSVMVMCB pVmcb, uint64_t fCtrlIntercept)
+{
+    if (pVmcb->ctrl.u64InterceptCtrl & fCtrlIntercept)
+    {
+        bool fRemove = true;
+#ifdef VBOX_WITH_NESTED_HWVIRT
+        /* Only remove the control intercept if the nested-guest is also not intercepting it! */
+        if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
+        {
+            PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = hmR0SvmGetNestedVmcbCache(pVCpu, pCtx);
+            fRemove = !(pVmcbNstGstCache->u64InterceptCtrl & fCtrlIntercept);
+        }
+#else
+        RT_NOREF2(pVCpu, pCtx);
+#endif
+        if (fRemove)
+        {
+            pVmcb->ctrl.u64InterceptCtrl &= ~fCtrlIntercept;
+            pVmcb->ctrl.u32VmcbCleanBits &= ~HMSVM_VMCB_CLEAN_INTERCEPTS;
+        }
+    }
+}
+#endif
 
 /**
@@ -1469 +1519 @@
     {
         uShadowCr0 |= X86_CR0_NE;
-        hmR0SvmAddXcptIntercept(pVmcb, X86_XCPT_MF);
+        hmR0SvmSetXcptIntercept(pVmcb, X86_XCPT_MF);
     }
     else
-        hmR0SvmRemoveXcptIntercept(pVCpu, pCtx, pVmcb, X86_XCPT_MF);
+        hmR0SvmClearXcptIntercept(pVCpu, pCtx, pVmcb, X86_XCPT_MF);
 
     /*
@@ -2033 +2083 @@
         /* Trap #UD for GIM provider (e.g. for hypercalls). */
         if (pVCpu->hm.s.fGIMTrapXcptUD)
-            hmR0SvmAddXcptIntercept(pVmcb, X86_XCPT_UD);
+            hmR0SvmSetXcptIntercept(pVmcb, X86_XCPT_UD);
         else
-            hmR0SvmRemoveXcptIntercept(pVCpu, pCtx, pVmcb, X86_XCPT_UD);
+            hmR0SvmClearXcptIntercept(pVCpu, pCtx, pVmcb, X86_XCPT_UD);
 
         /* Trap #BP for INT3 debug breakpoints set by the VM debugger. */
         if (pVCpu->CTX_SUFF(pVM)->dbgf.ro.cEnabledInt3Breakpoints)
-            hmR0SvmAddXcptIntercept(pVmcb, X86_XCPT_BP);
+            hmR0SvmSetXcptIntercept(pVmcb, X86_XCPT_BP);
         else
-            hmR0SvmRemoveXcptIntercept(pVCpu, pCtx, pVmcb, X86_XCPT_BP);
+            hmR0SvmClearXcptIntercept(pVCpu, pCtx, pVmcb, X86_XCPT_BP);
 
         /* The remaining intercepts are handled elsewhere, e.g. in hmR0SvmLoadSharedCR0(). */