Changeset 55037 in vbox for trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

Timestamp:

Mar 31, 2015 2:09:10 PM (10 years ago)

Author:

vboxsync

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

99322

Message:

VMM/GIM: Add hypercall support and KVM spinlock support.

File:

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

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

@@ -296 +296 @@
 static FNSVMEXITHANDLER hmR0SvmExitXcptPF;
 static FNSVMEXITHANDLER hmR0SvmExitXcptNM;
+static FNSVMEXITHANDLER hmR0SvmExitXcptUD;
 static FNSVMEXITHANDLER hmR0SvmExitXcptMF;
 static FNSVMEXITHANDLER hmR0SvmExitXcptDB;
@@ -669 +670 @@
     Assert(pVM->hm.s.svm.fSupported);
 
+    pVM->hm.s.fTrapXcptUD             = GIMShouldTrapXcptUD(pVM);
+    uint32_t const fGimXcptIntercepts = pVM->hm.s.fTrapXcptUD ? RT_BIT(X86_XCPT_UD) : 0;
     for (VMCPUID i = 0; i < pVM->cCpus; i++)
     {
@@ -783 +786 @@
         pVmcb->ctrl.u32InterceptCtrl1 |= SVM_CTRL1_INTERCEPT_TASK_SWITCH;
 #endif
+
+        /* Apply the exceptions intercepts needed by the GIM provider. */
+        pVmcb->ctrl.u32InterceptException |= fGimXcptIntercepts;
 
         /*
@@ -3476 +3482 @@
             return hmR0SvmExitXcptNM(pVCpu, pCtx, pSvmTransient);
 
+        case SVM_EXIT_EXCEPTION_6:  /* X86_XCPT_UD */
+            return hmR0SvmExitXcptUD(pVCpu, pCtx, pSvmTransient);
+
         case SVM_EXIT_EXCEPTION_10:  /* X86_XCPT_MF */
             return hmR0SvmExitXcptMF(pVCpu, pCtx, pSvmTransient);
@@ -3582 +3591 @@
                 case SVM_EXIT_EXCEPTION_4:             /* X86_XCPT_OF */
                 case SVM_EXIT_EXCEPTION_5:             /* X86_XCPT_BR */
-                case SVM_EXIT_EXCEPTION_6:             /* X86_XCPT_UD */
+                /* case SVM_EXIT_EXCEPTION_6: */       /* X86_XCPT_UD - Handled above. */
                 /*   SVM_EXIT_EXCEPTION_7: */          /* X86_XCPT_NM - Handled above. */
                 case SVM_EXIT_EXCEPTION_8:             /* X86_XCPT_DF */
@@ -3619 +3628 @@
                             /** @todo Investigate this later. */
                             STAM_COUNTER_INC(&pVCpu->hm.s.StatExitGuestBP);
-                            break;
-
-                        case X86_XCPT_UD:
-                            STAM_COUNTER_INC(&pVCpu->hm.s.StatExitGuestUD);
                             break;
 
@@ -4152 +4157 @@
     {
         PSVMVMCB pVmcb = (PSVMVMCB)pVCpu->hm.s.svm.pvVmcb;
+        Assert(pVmcb->ctrl.u64NextRIP - pCtx->rip == cb);
         pCtx->rip = pVmcb->ctrl.u64NextRIP;
     }
@@ -5003 +5009 @@
         if (GIMAreHypercallsEnabled(pVCpu))
             rc = GIMHypercall(pVCpu, pCtx);
-    }
-
-    if (rc != VINF_SUCCESS)
+
+        /* If the hypercall changes anything other than guest general-purpose registers,
+           we would need to reload the guest changed bits on VM-reentry. */
+    }
+
+    if (RT_SUCCESS(rc))
+        hmR0SvmUpdateRip(pVCpu, pCtx, 3);
+    else
         hmR0SvmSetPendingXcptUD(pVCpu);
     return VINF_SUCCESS;
@@ -5202 +5213 @@
 
 /**
+ * #VMEXIT handler for undefined opcode (SVM_EXIT_EXCEPTION_6).
+ * Conditional #VMEXIT.
+ */
+HMSVM_EXIT_DECL hmR0SvmExitXcptUD(PVMCPU pVCpu, PCPUMCTX pCtx, PSVMTRANSIENT pSvmTransient)
+{
+    HMSVM_VALIDATE_EXIT_HANDLER_PARAMS();
+
+    HMSVM_CHECK_EXIT_DUE_TO_EVENT_DELIVERY();
+
+    STAM_COUNTER_INC(&pVCpu->hm.s.StatExitGuestUD);
+
+    PVM pVM = pVCpu->CTX_SUFF(pVM);
+    if (   pVM->hm.s.fTrapXcptUD
+        && GIMAreHypercallsEnabled(pVCpu))
+    {
+        int rc = GIMXcptUD(pVCpu, pCtx);
+        if (RT_SUCCESS(rc))
+        {
+            /* If the exception handler changes anything other than guest general-purpose registers,
+               we would need to reload the guest changed bits on VM-reentry. */
+            hmR0SvmUpdateRip(pVCpu, pCtx, 3);
+            return VINF_SUCCESS;
+        }
+    }
+
+    hmR0SvmSetPendingXcptUD(pVCpu);
+    return VINF_SUCCESS;
+}
+
+
+/**
  * #VMEXIT handler for math-fault exceptions (SVM_EXIT_EXCEPTION_10).
  * Conditional #VMEXIT.