Changeset 47123 in vbox for trunk/src/VBox

Timestamp:

Jul 12, 2013 3:31:44 PM (12 years ago)

Author:

vboxsync

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

87217

Message:

VMM/HM: Dispatch host NMIs on Intel. Added separate STAM counter for host NMIs with the necessary changes to old, new VT-x, AMD-V code.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMR0A.asm (modified) (1 diff)
• VMMR0/HMSVMR0.cpp (modified) (1 diff)
• VMMR0/HMVMXR0.cpp (modified) (3 diffs)
• VMMR0/HWSVMR0.cpp (modified) (1 diff)
• VMMR0/HWVMXR0.cpp (modified) (1 diff)
• VMMR3/HM.cpp (modified) (1 diff)
• include/HMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMR0/HMR0A.asm

@@ -373 +373 @@
     ret
 ENDPROC VMXRestoreHostState
+
+
+;/**
+; * Dispatches an NMI to the host.
+; */
+ALIGNCODE(16)
+BEGINPROC VMXDispatchHostNmi
+    int 2   ; NMI is always vector 2. The IDT[2] IRQ handler cannot be anything else. See Intel spec. 6.3.1 "External Interrupts".
+    ret
+ENDPROC VMXDispatchHostNmi
 
 

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

@@ -3532 +3532 @@
 {
     HMSVM_VALIDATE_EXIT_HANDLER_PARAMS();
-    STAM_COUNTER_INC(&pVCpu->hm.s.StatExitExtInt);
+
+#ifdef VBOX_WITH_STATISTICS
+    if (pSvmTransient->u64ExitCode == SVM_EXIT_NMI)
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatExitHostNmi);
+    else if (pSvmTransient->u64ExitCode == SVM_EXIT_INTR)
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatExitExtInt);
+#endif
 
     /*

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

@@ -7365 +7365 @@
     if (uIntrType == VMX_EXIT_INTERRUPTION_INFO_TYPE_NMI)
     {
-        /** @todo We should inject the NMI to the host by calling the NMI
-         *  interrupt handler! See Intel spec. 27.5.5 "Updating Non-Register State". */
+        /*
+         * This cannot be a guest NMI as the only way for the guest to receive an NMI is if we injected it ourselves and
+         * anything we inject is not going to cause a VM-exit directly for the event being injected.
+         * See Intel spec. 27.2.3 "Information for VM Exits During Event Delivery".
+         *
+         * Dispatch the NMI to the host. See Intel spec. 27.5.5 "Updating Non-Register State".
+         */
+        VMXDispatchHostNmi();
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatExitHostNmi);
         STAM_PROFILE_ADV_STOP(&pVCpu->hm.s.StatExitXcptNmi, y3);
-        return VINF_EM_RAW_INTERRUPT;
+        return VINF_SUCCESS;
     }
 
@@ -7434 +7441 @@
                     {
                         AssertMsgFailed(("Unexpected VM-exit caused by exception %#x\n", uVector));
+                        pVCpu->hm.s.u32HMError = uVector;
                         rc = VERR_VMX_UNEXPECTED_EXCEPTION;
                     }
@@ -7442 +7450 @@
         }
 
-        case VMX_EXIT_INTERRUPTION_INFO_TYPE_DB_XCPT:
         default:
         {
+            pVCpu->hm.s.u32HMError = uExitIntrInfo;
             rc = VERR_VMX_UNEXPECTED_INTERRUPTION_EXIT_CODE;
             AssertMsgFailed(("Unexpected interruption code %#x\n", VMX_EXIT_INTERRUPTION_INFO_TYPE(uExitIntrInfo)));

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

@@ -2229 +2229 @@
         goto ResumeExecution;
 
-    case SVM_EXIT_INTR:         STAM_COUNTER_INC(&pVCpu->hm.s.StatExitExtInt);  /* no break */
+    case SVM_EXIT_INTR:
     case SVM_EXIT_FERR_FREEZE:
     case SVM_EXIT_NMI:
     case SVM_EXIT_SMI:
     case SVM_EXIT_INIT:
+#ifdef VBOX_WITH_STATISTICS
+        if (vector == SVM_EXIT_INTR)
+            STAM_COUNTER_INC(&pVCpu->hm.s.StatExitExtInt);
+        else if (vector == SVM_EXIT_NMI)
+            STAM_COUNTER_INC(&pVCpu->hm.s.StatExitHostNmi);
+#endif
         /* External interrupt; leave to allow it to be dispatched again. */
         rc = VINF_EM_RAW_INTERRUPT;

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

@@ -3535 +3535 @@
         case VMX_EXIT_INTERRUPTION_INFO_TYPE_NMI:       /* Non-maskable interrupt. */
             /* External interrupt; leave to allow it to be dispatched again. */
+            STAM_COUNTER_INC(&pVCpu->hm.s.StatExitHostNmi);
             rc = VINF_EM_RAW_INTERRUPT;
             break;

trunk/src/VBox/VMM/VMMR3/HM.cpp

@@ -682 +682 @@
         HM_REG_COUNTER(&pVCpu->hm.s.StatExitMaxResume,          "/HM/CPU%d/Exit/MaxResume", "Maximum VMRESUME inner-loop counter reached.");
         HM_REG_COUNTER(&pVCpu->hm.s.StatExitExtInt,             "/HM/CPU%d/Exit/ExtInt", "Host interrupt received.");
+        HM_REG_COUNTER(&pVCpu->hm.s.StatExitHostNmi,            "/HM/CPU%d/Exit/HostNmi", "Host NMI received.");
         HM_REG_COUNTER(&pVCpu->hm.s.StatExitPreemptTimer,       "/HM/CPU%d/Exit/PreemptTimer", "VMX-preemption timer expired.");
         HM_REG_COUNTER(&pVCpu->hm.s.StatExitTprBelowThreshold,  "/HM/CPU%d/Exit/TprBelowThreshold", "TPR lowered below threshold by the guest.");

trunk/src/VBox/VMM/include/HMInternal.h

@@ -849 +849 @@
     STAMCOUNTER             StatExitMaxResume;
     STAMCOUNTER             StatExitExtInt;
+    STAMCOUNTER             StatExitHostNmi;
     STAMCOUNTER             StatExitPreemptTimer;
     STAMCOUNTER             StatExitTprBelowThreshold;