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

Timestamp:

Dec 8, 2017 7:59:16 AM (7 years ago)

Author:

vboxsync

Message:

VMM/HMSVMR0: Nested Hw.virt: Added hmR0SvmExitXcptGeneric to redirect all un-intercepted exceptions by the nested-guest
back to the outer guest.

File:

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

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

@@ -335 +335 @@
 static FNSVMEXITHANDLER hmR0SvmExitInvlpga;
 static FNSVMEXITHANDLER hmR0SvmExitVmrun;
+static FNSVMEXITHANDLER hmR0SvmExitXcptGeneric;
 static FNSVMEXITHANDLER hmR0SvmNestedExitXcptDB;
 static FNSVMEXITHANDLER hmR0SvmNestedExitXcptBP;
@@ -4891 +4892 @@
 
         case SVM_EXIT_INTR:
+        case SVM_EXIT_NMI:
+        {
+            /* We shouldn't direct physical interrupts, NMIs to the nested-guest. */
+            return hmR0SvmExitIntr(pVCpu, pCtx, pSvmTransient);
+        }
+
         case SVM_EXIT_FERR_FREEZE:
-        case SVM_EXIT_NMI:
-        {
-            /* We shouldn't direct physical interrupts, NMI, FERR to the nested-guest. */
+        {
+            if (HMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_VINTR))
+                return HM_SVM_VMEXIT_NESTED(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
             return hmR0SvmExitIntr(pVCpu, pCtx, pSvmTransient);
         }
@@ -4968 +4975 @@
                     if (HMIsGuestSvmXcptInterceptSet(pVCpu, pCtx, uVector))
                         return HM_SVM_VMEXIT_NESTED(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
-                    /** @todo Write hmR0SvmExitXcptGeneric! */
-                    return VERR_NOT_IMPLEMENTED;
+                    return hmR0SvmExitXcptGeneric(pVCpu, pCtx, pSvmTransient);
                 }
 
@@ -4998 +5004 @@
                         return HM_SVM_VMEXIT_NESTED(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
                     return hmR0SvmExitShutdown(pVCpu, pCtx, pSvmTransient);
-                }
-
-                case SVM_EXIT_SMI:
-                {
-                    if (HMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_SMI))
-                        return HM_SVM_VMEXIT_NESTED(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
-                    return hmR0SvmExitUnexpected(pVCpu, pCtx, pSvmTransient);
-                }
-
-                case SVM_EXIT_INIT:
-                {
-                    if (HMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_INIT))
-                        return HM_SVM_VMEXIT_NESTED(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
-                    return hmR0SvmExitUnexpected(pVCpu, pCtx, pSvmTransient);
                 }
 
@@ -5079 +5071 @@
                 }
 
-                case SVM_EXIT_NPF:
+                case SVM_EXIT_SMI:
+                case SVM_EXIT_INIT:
+                case SVM_EXIT_NPF: /* We don't yet support nested-paging for nested-guests, so this should never happen. */
                 {
-                    /* We don't yet support nested-paging for nested-guests, so this should never really happen. */
                     return hmR0SvmExitUnexpected(pVCpu, pCtx, pSvmTransient);
                 }
@@ -7492 +7485 @@
 
 /**
+ * \#VMEXIT handler for generic exceptions. Conditional \#VMEXIT.
+ */
+HMSVM_EXIT_DECL hmR0SvmExitXcptGeneric(PVMCPU pVCpu, PCPUMCTX pCtx, PSVMTRANSIENT pSvmTransient)
+{
+    HMSVM_VALIDATE_EXIT_HANDLER_PARAMS();
+
+    /** @todo if triple-fault is returned in nested-guest scenario convert to a
+     *        shutdown VMEXIT. */
+    HMSVM_CHECK_EXIT_DUE_TO_EVENT_DELIVERY();
+
+    PSVMVMCB pVmcb = hmR0SvmGetCurrentVmcb(pVCpu, pCtx);
+    uint8_t const  uVector  = pVmcb->ctrl.u64ExitCode - SVM_EXIT_EXCEPTION_0;
+    uint32_t const uErrCode = pVmcb->ctrl.u64ExitInfo1;
+    Assert(pSvmTransient->u64ExitCode == pVmcb->ctrl.u64ExitCode);
+    Assert(uVector <= X86_XCPT_LAST);
+
+    SVMEVENT Event;
+    Event.u          = 0;
+    Event.n.u1Valid  = 1;
+    Event.n.u3Type   = SVM_EVENT_EXCEPTION;
+    Event.n.u8Vector = uVector;
+    switch (uVector)
+    {
+        case X86_XCPT_PF:
+        case X86_XCPT_DF:
+        case X86_XCPT_TS:
+        case X86_XCPT_NP:
+        case X86_XCPT_SS:
+        case X86_XCPT_GP:
+        case X86_XCPT_AC:
+        {
+            Event.n.u1ErrorCodeValid = 1;
+            Event.n.u32ErrorCode     = uErrCode;
+            break;
+        }
+    }
+
+    hmR0SvmSetPendingEvent(pVCpu, &Event, 0 /* GCPtrFaultAddress */);
+    return VINF_SUCCESS;
+}
+
+
+/**
  * Nested-guest \#VMEXIT handler for debug exceptions (SVM_EXIT_EXCEPTION_1).
  * Unconditional \#VMEXIT.