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

Timestamp:

May 30, 2019 8:32:28 AM (6 years ago)

Author:

vboxsync

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

130981

Message:

VMM: Nested SVM: bugref:7243 Get rid of HMHasGuestSvmVmcbCached as a separate function call.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/CPUMAllRegs.cpp (modified) (4 diffs)
• VMMAll/HMSVMAll.cpp (modified) (4 diffs)
• VMMR0/HMSVMR0.cpp (modified) (45 diffs)

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

@@ -2975 +2975 @@
     {
         PCVMXVVMCS pVmcs = pCtx->hwvirt.vmx.CTX_SUFF(pVmcs);
+        Assert(pVmcs);
         if (CPUMIsGuestVmxProcCtlsSet(pVCpu, pCtx, VMX_PROC_CTLS_USE_TSC_OFFSETTING))
             return uTicks + pVmcs->u64TscOffset.u;
@@ -2982 +2983 @@
     if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
     {
-        /** @todo r=bird: Bake HMApplySvmNstGstTscOffset into HMHasGuestSvmVmcbCached to save a call. */
-        if (!HMHasGuestSvmVmcbCached(pVCpu))
+        uint64_t u64TscOffset;
+        if (!HMGetGuestSvmTscOffset(pVCpu, &u64TscOffset))
         {
             PCSVMVMCB pVmcb = pCtx->hwvirt.svm.CTX_SUFF(pVmcb);
-            return uTicks + pVmcb->ctrl.u64TSCOffset;
+            Assert(pVmcb);
+            u64TscOffset = pVmcb->ctrl.u64TSCOffset;
         }
-        return HMApplySvmNstGstTscOffset(pVCpu, uTicks);
+        return uTicks + u64TscOffset;
     }
 #else
@@ -3016 +3018 @@
         {
             PCVMXVVMCS pVmcs = pCtx->hwvirt.vmx.CTX_SUFF(pVmcs);
+            Assert(pVmcs);
             return uTicks - pVmcs->u64TscOffset.u;
         }
@@ -3023 +3026 @@
     if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
     {
-        /** @todo r=bird: Bake HMApplySvmNstGstTscOffset into HMRemoveSvmNstGstTscOffset to save a call. */
-        if (!HMHasGuestSvmVmcbCached(pVCpu))
+        uint64_t u64TscOffset;
+        if (!HMGetGuestSvmTscOffset(pVCpu, &u64TscOffset))
         {
             PCSVMVMCB pVmcb = pCtx->hwvirt.svm.CTX_SUFF(pVmcb);
-            return uTicks - pVmcb->ctrl.u64TSCOffset;
+            Assert(pVmcb);
+            u64TscOffset = pVmcb->ctrl.u64TSCOffset;
         }
-        return HMRemoveSvmNstGstTscOffset(pVCpu, uTicks);
+        return uTicks - u64TscOffset;
     }
 #else

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

@@ -189 +189 @@
     bool const fUseVGif = fVGif && pVM->hm.s.svm.fVGif;
     return fVGif && fUseVGif;
-}
-
-
-/**
- * Applies the TSC offset of an SVM nested-guest if any and returns the new TSC
- * value for the nested-guest.
- *
- * @returns The TSC offset after applying any nested-guest TSC offset.
- * @param   pVCpu       The cross context virtual CPU structure of the calling EMT.
- * @param   uTicks      The guest TSC.
- *
- * @remarks This function looks at the VMCB cache rather than directly at the
- *          nested-guest VMCB. The latter may have been modified for executing
- *          using hardware-assisted SVM.
- *
- * @sa      CPUMRemoveNestedGuestTscOffset, HMRemoveSvmNstGstTscOffset.
- */
-VMM_INT_DECL(uint64_t) HMApplySvmNstGstTscOffset(PCVMCPU pVCpu, uint64_t uTicks)
-{
-    PCCPUMCTX pCtx = &pVCpu->cpum.GstCtx;
-    Assert(CPUMIsGuestInSvmNestedHwVirtMode(pCtx)); RT_NOREF(pCtx);
-    PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
-    Assert(pVmcbNstGstCache->fCacheValid);
-    return uTicks + pVmcbNstGstCache->u64TSCOffset;
-}
-
-
-/**
- * Removes the TSC offset of an SVM nested-guest if any and returns the new TSC
- * value for the guest.
- *
- * @returns The TSC offset after removing any nested-guest TSC offset.
- * @param   pVCpu       The cross context virtual CPU structure of the calling EMT.
- * @param   uTicks      The nested-guest TSC.
- *
- * @remarks This function looks at the VMCB cache rather than directly at the
- *          nested-guest VMCB. The latter may have been modified for executing
- *          using hardware-assisted SVM.
- *
- * @sa      CPUMApplyNestedGuestTscOffset, HMApplySvmNstGstTscOffset.
- */
-VMM_INT_DECL(uint64_t) HMRemoveSvmNstGstTscOffset(PCVMCPU pVCpu, uint64_t uTicks)
-{
-    PCCPUMCTX pCtx = &pVCpu->cpum.GstCtx;
-    Assert(CPUMIsGuestInSvmNestedHwVirtMode(pCtx)); RT_NOREF(pCtx);
-    PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
-    Assert(pVmcbNstGstCache->fCacheValid);
-    return uTicks - pVmcbNstGstCache->u64TSCOffset;
 }
 
@@ -354 +306 @@
 
 /**
- * Returns whether HM has cached the nested-guest VMCB.
- *
- * If the VMCB is cached by HM, it means HM may have potentially modified the
- * VMCB for execution using hardware-assisted SVM.
- *
- * @returns true if HM has cached the nested-guest VMCB, false otherwise.
- * @param   pVCpu   The cross context virtual CPU structure of the calling EMT.
- */
-VMM_INT_DECL(bool) HMHasGuestSvmVmcbCached(PCVMCPU pVCpu)
-{
-    PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
-    return pVmcbNstGstCache->fCacheValid;
-}
-
-
-/**
- * Checks if the nested-guest VMCB has the specified ctrl/instruction intercept
- * active.
- *
- * @returns @c true if in intercept is set, @c false otherwise.
- * @param   pVCpu       The cross context virtual CPU structure of the calling EMT.
- * @param   fIntercept  The SVM control/instruction intercept, see
- *                      SVM_CTRL_INTERCEPT_*.
- */
-VMM_INT_DECL(bool) HMIsGuestSvmCtrlInterceptSet(PCVMCPU pVCpu, uint64_t fIntercept)
-{
-    Assert(HMHasGuestSvmVmcbCached(pVCpu));
-    PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
-    return RT_BOOL(pVmcbNstGstCache->u64InterceptCtrl & fIntercept);
-}
-
-
-/**
- * Checks if the nested-guest VMCB has the specified CR read intercept active.
- *
- * @returns @c true if in intercept is set, @c false otherwise.
- * @param   pVCpu   The cross context virtual CPU structure of the calling EMT.
- * @param   uCr     The CR register number (0 to 15).
- */
-VMM_INT_DECL(bool) HMIsGuestSvmReadCRxInterceptSet(PCVMCPU pVCpu, uint8_t uCr)
-{
-    Assert(uCr < 16);
-    Assert(HMHasGuestSvmVmcbCached(pVCpu));
-    PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
-    return RT_BOOL(pVmcbNstGstCache->u16InterceptRdCRx & (1 << uCr));
-}
-
-
-/**
- * Checks if the nested-guest VMCB has the specified CR write intercept active.
- *
- * @returns @c true if in intercept is set, @c false otherwise.
- * @param   pVCpu   The cross context virtual CPU structure of the calling EMT.
- * @param   uCr     The CR register number (0 to 15).
- */
-VMM_INT_DECL(bool) HMIsGuestSvmWriteCRxInterceptSet(PCVMCPU pVCpu, uint8_t uCr)
-{
-    Assert(uCr < 16);
-    Assert(HMHasGuestSvmVmcbCached(pVCpu));
-    PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
-    return RT_BOOL(pVmcbNstGstCache->u16InterceptWrCRx & (1 << uCr));
-}
-
-
-/**
- * Checks if the nested-guest VMCB has the specified DR read intercept active.
- *
- * @returns @c true if in intercept is set, @c false otherwise.
- * @param   pVCpu   The cross context virtual CPU structure of the calling EMT.
- * @param   uDr     The DR register number (0 to 15).
- */
-VMM_INT_DECL(bool) HMIsGuestSvmReadDRxInterceptSet(PCVMCPU pVCpu, uint8_t uDr)
-{
-    Assert(uDr < 16);
-    Assert(HMHasGuestSvmVmcbCached(pVCpu));
-    PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
-    return RT_BOOL(pVmcbNstGstCache->u16InterceptRdDRx & (1 << uDr));
-}
-
-
-/**
- * Checks if the nested-guest VMCB has the specified DR write intercept active.
- *
- * @returns @c true if in intercept is set, @c false otherwise.
- * @param   pVCpu   The cross context virtual CPU structure of the calling EMT.
- * @param   uDr     The DR register number (0 to 15).
- */
-VMM_INT_DECL(bool) HMIsGuestSvmWriteDRxInterceptSet(PCVMCPU pVCpu, uint8_t uDr)
-{
-    Assert(uDr < 16);
-    Assert(HMHasGuestSvmVmcbCached(pVCpu));
-    PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
-    return RT_BOOL(pVmcbNstGstCache->u16InterceptWrDRx & (1 << uDr));
-}
-
-
-/**
- * Checks if the nested-guest VMCB has the specified exception intercept active.
- *
- * @returns true if in intercept is active, false otherwise.
- * @param   pVCpu       The cross context virtual CPU structure of the calling EMT.
- * @param   uVector     The exception / interrupt vector.
- */
-VMM_INT_DECL(bool) HMIsGuestSvmXcptInterceptSet(PCVMCPU pVCpu, uint8_t uVector)
-{
-    Assert(uVector < 32);
-    Assert(HMHasGuestSvmVmcbCached(pVCpu));
-    PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
-    return RT_BOOL(pVmcbNstGstCache->u32InterceptXcpt & (1 << uVector));
+ * Gets the SVM nested-guest control intercepts if cached by HM.
+ *
+ * @returns @c true on success, @c false otherwise.
+ * @param   pVCpu           The cross context virtual CPU structure of the calling
+ *                          EMT.
+ * @param   pu64Intercepts  Where to store the control intercepts. Only updated when
+ *                          @c true is returned.
+ */
+VMM_INT_DECL(bool) HMGetGuestSvmCtrlIntercepts(PCVMCPU pVCpu, uint64_t *pu64Intercepts)
+{
+    Assert(pu64Intercepts);
+    PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
+    if (pVmcbNstGstCache->fCacheValid)
+    {
+        *pu64Intercepts = pVmcbNstGstCache->u64InterceptCtrl;
+        return true;
+    }
+    return false;
+}
+
+
+/**
+ * Gets the SVM nested-guest CRx-read intercepts if cached by HM.
+ *
+ * @returns @c true on success, @c false otherwise.
+ * @param   pVCpu           The cross context virtual CPU structure of the calling
+ *                          EMT.
+ * @param   pu16Intercepts  Where to store the CRx-read intercepts. Only updated
+ *                          when @c true is returned.
+ */
+VMM_INT_DECL(bool) HMGetGuestSvmReadCRxIntercepts(PCVMCPU pVCpu, uint16_t *pu16Intercepts)
+{
+    Assert(pu16Intercepts);
+    PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
+    if (pVmcbNstGstCache->fCacheValid)
+    {
+        *pu16Intercepts = pVmcbNstGstCache->u16InterceptRdCRx;
+        return true;
+    }
+    return false;
+}
+
+
+/**
+ * Gets the SVM nested-guest CRx-write intercepts if cached by HM.
+ *
+ * @returns @c true on success, @c false otherwise.
+ * @param   pVCpu           The cross context virtual CPU structure of the calling
+ *                          EMT.
+ * @param   pu16Intercepts  Where to store the CRx-write intercepts. Only updated
+ *                          when @c true is returned.
+ */
+VMM_INT_DECL(bool) HMGetGuestSvmWriteCRxIntercepts(PCVMCPU pVCpu, uint16_t *pu16Intercepts)
+{
+    Assert(pu16Intercepts);
+    PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
+    if (pVmcbNstGstCache->fCacheValid)
+    {
+        *pu16Intercepts = pVmcbNstGstCache->u16InterceptWrCRx;
+        return true;
+    }
+    return false;
+}
+
+
+/**
+ * Gets the SVM nested-guest DRx-read intercepts if cached by HM.
+ *
+ * @returns @c true on success, @c false otherwise.
+ * @param   pVCpu           The cross context virtual CPU structure of the calling
+ *                          EMT.
+ * @param   pu16Intercepts  Where to store the DRx-read intercepts. Only updated
+ *                          when @c true is returned.
+ */
+VMM_INT_DECL(bool) HMGetGuestSvmReadDRxIntercepts(PCVMCPU pVCpu, uint16_t *pu16Intercepts)
+{
+    Assert(pu16Intercepts);
+    PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
+    if (pVmcbNstGstCache->fCacheValid)
+    {
+        *pu16Intercepts = pVmcbNstGstCache->u16InterceptRdDRx;
+        return true;
+    }
+    return false;
+}
+
+
+/**
+ * Gets the SVM nested-guest DRx-write intercepts if cached by HM.
+ *
+ * @returns @c true on success, @c false otherwise.
+ * @param   pVCpu           The cross context virtual CPU structure of the calling
+ *                          EMT.
+ * @param   pu16Intercepts  Where to store the DRx-write intercepts. Only updated
+ *                          when @c true is returned.
+ */
+VMM_INT_DECL(bool) HMGetGuestSvmWriteDRxIntercepts(PCVMCPU pVCpu, uint16_t *pu16Intercepts)
+{
+    Assert(pu16Intercepts);
+    PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
+    if (pVmcbNstGstCache->fCacheValid)
+    {
+        *pu16Intercepts = pVmcbNstGstCache->u16InterceptWrDRx;
+        return true;
+    }
+    return false;
+}
+
+
+/**
+ * Gets the SVM nested-guest exception intercepts if cached by HM.
+ *
+ * @returns @c true on success, @c false otherwise.
+ * @param   pVCpu           The cross context virtual CPU structure of the calling
+ *                          EMT.
+ * @param   pu32Intercepts  Where to store the exception intercepts. Only updated
+ *                          when @c true is returned.
+ */
+VMM_INT_DECL(bool) HMGetGuestSvmXcptIntercepts(PCVMCPU pVCpu, uint32_t *pu32Intercepts)
+{
+    Assert(pu32Intercepts);
+    PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
+    if (pVmcbNstGstCache->fCacheValid)
+    {
+        *pu32Intercepts = pVmcbNstGstCache->u32InterceptXcpt;
+        return true;
+    }
+    return false;
 }
 
@@ -469 +440 @@
  * Checks if the nested-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.
- */
-VMM_INT_DECL(bool) HMIsGuestSvmVirtIntrMasking(PCVMCPU pVCpu)
-{
-    Assert(HMHasGuestSvmVmcbCached(pVCpu));
-    PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
-    return pVmcbNstGstCache->fVIntrMasking;
-}
-
-
-/**
- * Checks if the nested-guest VMCB has nested-paging enabled.
- *
- * @returns true if nested-paging is enabled, @c false otherwise.
- * @param   pVCpu   The cross context virtual CPU structure of the calling EMT.
- */
-VMM_INT_DECL(bool) HMIsGuestSvmNestedPagingEnabled(PCVMCPU pVCpu)
-{
-    Assert(HMHasGuestSvmVmcbCached(pVCpu));
-    PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
-    return pVmcbNstGstCache->fNestedPaging;
+ * @returns @c true on success, @c false otherwise.
+ * @param   pVCpu           The cross context virtual CPU structure of the calling
+ *                          EMT.
+ * @param   pfVIntrMasking  Where to store the virtual-interrupt masking bit.
+ *                          Updated only when @c true is returned.
+ */
+VMM_INT_DECL(bool) HMGetGuestSvmVirtIntrMasking(PCVMCPU pVCpu, bool *pfVIntrMasking)
+{
+    Assert(pfVIntrMasking);
+    PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
+    if (pVmcbNstGstCache->fCacheValid)
+    {
+        *pfVIntrMasking = pVmcbNstGstCache->fVIntrMasking;
+        return true;
+    }
+    return false;
+}
+
+
+/**
+ * Gets the SVM nested-guest nested-paging bit if cached by HM.
+ *
+ * @returns @c true on success, @c false otherwise.
+ * @param   pVCpu               The cross context virtual CPU structure of the
+ *                              calling EMT.
+ * @param   pfNestedPagingCtrl  Where to store the nested-paging bit. Updated only
+ *                              when @c true is returned.
+ */
+VMM_INT_DECL(bool) HMGetGuestSvmNestedPaging(PCVMCPU pVCpu, bool *pfNestedPaging)
+{
+    Assert(pfNestedPaging);
+    PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
+    if (pVmcbNstGstCache->fCacheValid)
+    {
+        *pfNestedPaging = pVmcbNstGstCache->fNestedPaging;
+        return true;
+    }
+    return false;
 }
 
@@ -497 +484 @@
  * Returns the nested-guest VMCB pause-filter count.
  *
- * @returns The pause-filter count.
- * @param   pVCpu   The cross context virtual CPU structure of the calling EMT.
- */
-VMM_INT_DECL(uint16_t) HMGetGuestSvmPauseFilterCount(PCVMCPU pVCpu)
-{
-    Assert(HMHasGuestSvmVmcbCached(pVCpu));
-    PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
-    return pVmcbNstGstCache->u16PauseFilterCount;
-}
-
+ * @returns @c true on success, @c false otherwise.
+ * @param   pVCpu                   The cross context virtual CPU structure of the
+ *                                  calling EMT.
+ * @param   pu16PauseFilterCount    Where to store the pause-filter count. Only
+ *                                  updated @c true is returned.
+ */
+VMM_INT_DECL(bool) HMGetGuestSvmPauseFilterCount(PCVMCPU pVCpu, uint16_t *pu16PauseFilterCount)
+{
+    Assert(pu16PauseFilterCount);
+    PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
+    if (pVmcbNstGstCache->fCacheValid)
+    {
+        *pu16PauseFilterCount = pVmcbNstGstCache->u16PauseFilterCount;
+        return true;
+    }
+    return false;
+}
+
+
+/**
+ * Returns the SVM nested-guest TSC offset if cached by HM.
+ *
+ * @returns The TSC offset after applying any nested-guest TSC offset.
+ * @param   pVCpu           The cross context virtual CPU structure of the calling
+ *                          EMT.
+ * @param   pu64TscOffset   Where to store the TSC offset. Only updated when @c
+ *                          true is returned.
+ */
+VMM_INT_DECL(bool) HMGetGuestSvmTscOffset(PCVMCPU pVCpu, uint64_t *pu64TscOffset)
+{
+    Assert(pu64TscOffset);
+    PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
+    if (pVmcbNstGstCache->fCacheValid)
+    {
+        *pu64TscOffset = pVmcbNstGstCache->u64TSCOffset;
+        return true;
+    }
+    return false;
+}
+

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

@@ -2079 +2079 @@
         uint16_t const uGuestPauseFilterCount     = pVM->hm.s.svm.cPauseFilter;
         uint16_t const uGuestPauseFilterThreshold = pVM->hm.s.svm.cPauseFilterThresholdTicks;
-        if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_PAUSE))
+        if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, &pVCpu->cpum.GstCtx, SVM_CTRL_INTERCEPT_PAUSE))
         {
             PCCPUMCTX pCtx = &pVCpu->cpum.GstCtx;
@@ -3337 +3337 @@
         /* Apply the nested-guest VMCB's TSC offset over the guest TSC offset. */
         if (CPUMIsGuestInSvmNestedHwVirtMode(&pVCpu->cpum.GstCtx))
-            uTscOffset = HMApplySvmNstGstTscOffset(pVCpu, uTscOffset);
+            uTscOffset = CPUMApplyNestedGuestTscOffset(pVCpu, uTscOffset);
 #endif
 
@@ -4706 +4706 @@
         {
             /* The nested-guest VMCB TSC offset shall eventually be restored on #VMEXIT via HMNotifySvmNstGstVmexit(). */
-            uint64_t const uGstTsc = HMRemoveSvmNstGstTscOffset(pVCpu, uHostTsc + pVmcbCtrl->u64TSCOffset);
+            uint64_t const uGstTsc = CPUMRemoveNestedGuestTscOffset(pVCpu, uHostTsc + pVmcbCtrl->u64TSCOffset);
             TMCpuTickSetLastSeen(pVCpu, uGstTsc);
         }
@@ -5180 +5180 @@
      */
     PSVMVMCB       pVmcbNstGst     = pVCpu->cpum.GstCtx.hwvirt.svm.CTX_SUFF(pVmcb);
+    PCCPUMCTX      pCtx            = &pVCpu->cpum.GstCtx;
     PSVMVMCBCTRL   pVmcbNstGstCtrl = &pVmcbNstGst->ctrl;
     uint64_t const uExitCode       = pVmcbNstGstCtrl->u64ExitCode;
@@ -5190 +5191 @@
         case SVM_EXIT_CPUID:
         {
-            if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_CPUID))
+            if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_CPUID))
                 NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
             return hmR0SvmExitCpuid(pVCpu, pSvmTransient);
@@ -5197 +5198 @@
         case SVM_EXIT_RDTSC:
         {
-            if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_RDTSC))
+            if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_RDTSC))
                 NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
             return hmR0SvmExitRdtsc(pVCpu, pSvmTransient);
@@ -5204 +5205 @@
         case SVM_EXIT_RDTSCP:
         {
-            if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_RDTSCP))
+            if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_RDTSCP))
                 NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
             return hmR0SvmExitRdtscp(pVCpu, pSvmTransient);
@@ -5211 +5212 @@
         case SVM_EXIT_MONITOR:
         {
-            if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_MONITOR))
+            if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_MONITOR))
                 NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
             return hmR0SvmExitMonitor(pVCpu, pSvmTransient);
@@ -5218 +5219 @@
         case SVM_EXIT_MWAIT:
         {
-            if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_MWAIT))
+            if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_MWAIT))
                 NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
             return hmR0SvmExitMwait(pVCpu, pSvmTransient);
@@ -5225 +5226 @@
         case SVM_EXIT_HLT:
         {
-            if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_HLT))
+            if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_HLT))
                 NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
             return hmR0SvmExitHlt(pVCpu, pSvmTransient);
@@ -5232 +5233 @@
         case SVM_EXIT_MSR:
         {
-            if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_MSR_PROT))
+            if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_MSR_PROT))
             {
                 uint32_t const idMsr = pVCpu->cpum.GstCtx.ecx;
@@ -5269 +5270 @@
         case SVM_EXIT_IOIO:
         {
-            if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_IOIO_PROT))
+            if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_IOIO_PROT))
             {
                 void *pvIoBitmap = pVCpu->cpum.GstCtx.hwvirt.svm.CTX_SUFF(pvIoBitmap);
@@ -5290 +5291 @@
 
                 /* If the nested-guest is intercepting #PFs, cause a #PF #VMEXIT. */
-                if (HMIsGuestSvmXcptInterceptSet(pVCpu, X86_XCPT_PF))
+                if (CPUMIsGuestSvmXcptInterceptSet(pVCpu, pCtx, X86_XCPT_PF))
                     NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, u32ErrCode, uFaultAddress);
 
@@ -5303 +5304 @@
         case SVM_EXIT_XCPT_UD:
         {
-            if (HMIsGuestSvmXcptInterceptSet(pVCpu, X86_XCPT_UD))
+            if (CPUMIsGuestSvmXcptInterceptSet(pVCpu, pCtx, X86_XCPT_UD))
                 NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
             hmR0SvmSetPendingXcptUD(pVCpu);
@@ -5311 +5312 @@
         case SVM_EXIT_XCPT_MF:
         {
-            if (HMIsGuestSvmXcptInterceptSet(pVCpu, X86_XCPT_MF))
+            if (CPUMIsGuestSvmXcptInterceptSet(pVCpu, pCtx, X86_XCPT_MF))
                 NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
             return hmR0SvmExitXcptMF(pVCpu, pSvmTransient);
@@ -5318 +5319 @@
         case SVM_EXIT_XCPT_DB:
         {
-            if (HMIsGuestSvmXcptInterceptSet(pVCpu, X86_XCPT_DB))
+            if (CPUMIsGuestSvmXcptInterceptSet(pVCpu, pCtx, X86_XCPT_DB))
                 NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
             return hmR0SvmNestedExitXcptDB(pVCpu, pSvmTransient);
@@ -5325 +5326 @@
         case SVM_EXIT_XCPT_AC:
         {
-            if (HMIsGuestSvmXcptInterceptSet(pVCpu, X86_XCPT_AC))
+            if (CPUMIsGuestSvmXcptInterceptSet(pVCpu, pCtx, X86_XCPT_AC))
                 NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
             return hmR0SvmExitXcptAC(pVCpu, pSvmTransient);
@@ -5332 +5333 @@
         case SVM_EXIT_XCPT_BP:
         {
-            if (HMIsGuestSvmXcptInterceptSet(pVCpu, X86_XCPT_BP))
+            if (CPUMIsGuestSvmXcptInterceptSet(pVCpu, pCtx, X86_XCPT_BP))
                 NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
             return hmR0SvmNestedExitXcptBP(pVCpu, pSvmTransient);
@@ -5342 +5343 @@
         {
             uint8_t const uCr = uExitCode - SVM_EXIT_READ_CR0;
-            if (HMIsGuestSvmReadCRxInterceptSet(pVCpu, uCr))
+            if (CPUMIsGuestSvmReadCRxInterceptSet(pVCpu, pCtx, uCr))
                 NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
             return hmR0SvmExitReadCRx(pVCpu, pSvmTransient);
@@ -5349 +5350 @@
         case SVM_EXIT_CR0_SEL_WRITE:
         {
-            if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_CR0_SEL_WRITE))
+            if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_CR0_SEL_WRITE))
                 NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
             return hmR0SvmExitWriteCRx(pVCpu, pSvmTransient);
@@ -5362 +5363 @@
             Log4Func(("Write CR%u: uExitInfo1=%#RX64 uExitInfo2=%#RX64\n", uCr, uExitInfo1, uExitInfo2));
 
-            if (HMIsGuestSvmWriteCRxInterceptSet(pVCpu, uCr))
+            if (CPUMIsGuestSvmWriteCRxInterceptSet(pVCpu, pCtx, uCr))
                 NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
             return hmR0SvmExitWriteCRx(pVCpu, pSvmTransient);
@@ -5369 +5370 @@
         case SVM_EXIT_PAUSE:
         {
-            if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_PAUSE))
+            if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_PAUSE))
                 NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
             return hmR0SvmExitPause(pVCpu, pSvmTransient);
@@ -5376 +5377 @@
         case SVM_EXIT_VINTR:
         {
-            if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_VINTR))
+            if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_VINTR))
                 NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
             return hmR0SvmExitUnexpected(pVCpu, pSvmTransient);
@@ -5402 +5403 @@
         case SVM_EXIT_FERR_FREEZE:
         {
-            if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_FERR_FREEZE))
+            if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_FERR_FREEZE))
                 NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
             return hmR0SvmExitFerrFreeze(pVCpu, pSvmTransient);
@@ -5409 +5410 @@
         case SVM_EXIT_INVLPG:
         {
-            if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_INVLPG))
+            if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_INVLPG))
                 NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
             return hmR0SvmExitInvlpg(pVCpu, pSvmTransient);
@@ -5416 +5417 @@
         case SVM_EXIT_WBINVD:
         {
-            if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_WBINVD))
+            if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_WBINVD))
                 NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
             return hmR0SvmExitWbinvd(pVCpu, pSvmTransient);
@@ -5423 +5424 @@
         case SVM_EXIT_INVD:
         {
-            if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_INVD))
+            if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_INVD))
                 NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
             return hmR0SvmExitInvd(pVCpu, pSvmTransient);
@@ -5430 +5431 @@
         case SVM_EXIT_RDPMC:
         {
-            if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_RDPMC))
+            if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_RDPMC))
                 NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
             return hmR0SvmExitRdpmc(pVCpu, pSvmTransient);
@@ -5445 +5446 @@
                 {
                     uint8_t const uDr = uExitCode - SVM_EXIT_READ_DR0;
-                    if (HMIsGuestSvmReadDRxInterceptSet(pVCpu, uDr))
+                    if (CPUMIsGuestSvmReadDRxInterceptSet(pVCpu, pCtx, uDr))
                         NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
                     return hmR0SvmExitReadDRx(pVCpu, pSvmTransient);
@@ -5456 +5457 @@
                 {
                     uint8_t const uDr = uExitCode - SVM_EXIT_WRITE_DR0;
-                    if (HMIsGuestSvmWriteDRxInterceptSet(pVCpu, uDr))
+                    if (CPUMIsGuestSvmWriteDRxInterceptSet(pVCpu, pCtx, uDr))
                         NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
                     return hmR0SvmExitWriteDRx(pVCpu, pSvmTransient);
@@ -5486 +5487 @@
                 {
                     uint8_t const uVector = uExitCode - SVM_EXIT_XCPT_0;
-                    if (HMIsGuestSvmXcptInterceptSet(pVCpu, uVector))
+                    if (CPUMIsGuestSvmXcptInterceptSet(pVCpu, pCtx, uVector))
                         NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
                     return hmR0SvmExitXcptGeneric(pVCpu, pSvmTransient);
@@ -5493 +5494 @@
                 case SVM_EXIT_XSETBV:
                 {
-                    if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_XSETBV))
+                    if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_XSETBV))
                         NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
                     return hmR0SvmExitXsetbv(pVCpu, pSvmTransient);
@@ -5500 +5501 @@
                 case SVM_EXIT_TASK_SWITCH:
                 {
-                    if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_TASK_SWITCH))
+                    if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_TASK_SWITCH))
                         NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
                     return hmR0SvmExitTaskSwitch(pVCpu, pSvmTransient);
@@ -5507 +5508 @@
                 case SVM_EXIT_IRET:
                 {
-                    if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_IRET))
+                    if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_IRET))
                         NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
                     return hmR0SvmExitIret(pVCpu, pSvmTransient);
@@ -5514 +5515 @@
                 case SVM_EXIT_SHUTDOWN:
                 {
-                    if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_SHUTDOWN))
+                    if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_SHUTDOWN))
                         NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
                     return hmR0SvmExitShutdown(pVCpu, pSvmTransient);
@@ -5521 +5522 @@
                 case SVM_EXIT_VMMCALL:
                 {
-                    if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_VMMCALL))
+                    if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_VMMCALL))
                         NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
                     return hmR0SvmExitVmmCall(pVCpu, pSvmTransient);
@@ -5528 +5529 @@
                 case SVM_EXIT_CLGI:
                 {
-                    if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_CLGI))
+                    if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_CLGI))
                         NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
                      return hmR0SvmExitClgi(pVCpu, pSvmTransient);
@@ -5535 +5536 @@
                 case SVM_EXIT_STGI:
                 {
-                    if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_STGI))
+                    if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_STGI))
                         NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
                      return hmR0SvmExitStgi(pVCpu, pSvmTransient);
@@ -5542 +5543 @@
                 case SVM_EXIT_VMLOAD:
                 {
-                    if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_VMLOAD))
+                    if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_VMLOAD))
                         NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
                     return hmR0SvmExitVmload(pVCpu, pSvmTransient);
@@ -5549 +5550 @@
                 case SVM_EXIT_VMSAVE:
                 {
-                    if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_VMSAVE))
+                    if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_VMSAVE))
                         NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
                     return hmR0SvmExitVmsave(pVCpu, pSvmTransient);
@@ -5556 +5557 @@
                 case SVM_EXIT_INVLPGA:
                 {
-                    if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_INVLPGA))
+                    if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_INVLPGA))
                         NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
                     return hmR0SvmExitInvlpga(pVCpu, pSvmTransient);
@@ -5563 +5564 @@
                 case SVM_EXIT_VMRUN:
                 {
-                    if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_VMRUN))
+                    if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_VMRUN))
                         NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
                     return hmR0SvmExitVmrun(pVCpu, pSvmTransient);
@@ -5570 +5571 @@
                 case SVM_EXIT_RSM:
                 {
-                    if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_RSM))
+                    if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_RSM))
                         NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
                     hmR0SvmSetPendingXcptUD(pVCpu);
@@ -5578 +5579 @@
                 case SVM_EXIT_SKINIT:
                 {
-                    if (HMIsGuestSvmCtrlInterceptSet(pVCpu, SVM_CTRL_INTERCEPT_SKINIT))
+                    if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_SKINIT))
                         NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
                     hmR0SvmSetPendingXcptUD(pVCpu);
@@ -7572 +7573 @@
             /* If the nested-guest is intercepting #PFs, cause a #PF #VMEXIT. */
             if (   CPUMIsGuestInSvmNestedHwVirtMode(pCtx)
-                && HMIsGuestSvmXcptInterceptSet(pVCpu, X86_XCPT_PF))
+                && CPUMIsGuestSvmXcptInterceptSet(pVCpu, pCtx, X86_XCPT_PF))
                 return VBOXSTRICTRC_TODO(IEMExecSvmVmexit(pVCpu, SVM_EXIT_XCPT_PF, uErrCode, uFaultAddress));
 #endif