Changeset 70002 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Dec 8, 2017 6:29:12 AM (7 years ago)

Author:

vboxsync

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

119526

Message:

VMM/HMSVMR0: Always intercept SMI.

File:

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

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

@@ -137 +137 @@
 #define HMSVM_MANDATORY_GUEST_CTRL_INTERCEPTS           (  SVM_CTRL_INTERCEPT_INTR        \
                                                          | SVM_CTRL_INTERCEPT_NMI         \
+                                                         | SVM_CTRL_INTERCEPT_SMI         \
                                                          | SVM_CTRL_INTERCEPT_INIT        \
                                                          | SVM_CTRL_INTERCEPT_RDPMC       \
@@ -158 +159 @@
                                                          | SVM_CTRL_INTERCEPT_MWAIT       \
                                                          | SVM_CTRL_INTERCEPT_XSETBV)
-
-/**
- *  Mandatory/unconditional nested-guest control intercepts.
- */
-#define HMSVM_MANDATORY_NESTED_GUEST_CTRL_INTERCEPTS    (  HMSVM_MANDATORY_GUEST_CTRL_INTERCEPTS \
-                                                         | SVM_CTRL_INTERCEPT_SMI)
 
 /** @name VMCB Clean Bits.
@@ -1908 +1903 @@
         pVmcbNstGst->ctrl.u32InterceptXcpt  |= pVmcb->ctrl.u32InterceptXcpt;
         pVmcbNstGst->ctrl.u64InterceptCtrl  |= pVmcb->ctrl.u64InterceptCtrl
-                                            |  HMSVM_MANDATORY_NESTED_GUEST_CTRL_INTERCEPTS;
+                                            |  HMSVM_MANDATORY_GUEST_CTRL_INTERCEPTS;
 
         /*
@@ -3221 +3216 @@
          * the guest's PIC/APIC).
          *
-         * External intercepts from the physical CPU are -always- intercepted when
-         * executing using hardware-assisted SVM, see HMSVM_MANDATORY_NESTED_GUEST_CTRL_INTERCEPTS.
+         * External intercepts, NMI, SMI etc. from the physical CPU are -always- intercepted
+         * when executing using hardware-assisted SVM, see HMSVM_MANDATORY_GUEST_CTRL_INTERCEPTS.
          *
          * External interrupts that are generated for the outer guest may be intercepted
@@ -4923 +4918 @@
 
         case SVM_EXIT_INTR:
-        {
-            /* We shouldn't direct physical interrupts to the nested-guest. */
-            return hmR0SvmExitIntr(pVCpu, pCtx, pSvmTransient);
-        }
-
         case SVM_EXIT_FERR_FREEZE:
-        {
-            if (HMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_FERR_FREEZE))
-                return HM_SVM_VMEXIT_NESTED(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
-            return hmR0SvmExitIntr(pVCpu, pCtx, pSvmTransient);
-        }
-
         case SVM_EXIT_NMI:
         {
-            if (HMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_NMI))
-                return HM_SVM_VMEXIT_NESTED(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
+            /* We shouldn't direct physical interrupts, NMI, FERR to the nested-guest. */
             return hmR0SvmExitIntr(pVCpu, pCtx, pSvmTransient);
         }
@@ -5282 +5265 @@
                 {
                     /*
-                     * We don't intercept SMIs. As for INIT signals, it really shouldn't ever happen here.
+                     * INIT signals, SMI shouldn't ever happen here.
                      * If it ever does, we want to know about it so log the exit code and bail.
                      */
@@ -7241 +7224 @@
         {
             /* Convert a #MF into a FERR -> IRQ 13. See @bugref{6117}. */
+            /** @todo FERR intercept when in nested-guest mode?   */
             rc = PDMIsaSetIrq(pVCpu->CTX_SUFF(pVM), 13, 1, 0 /* uTagSrc */);
             if (RT_SUCCESS(rc))