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

Timestamp:

Jun 21, 2017 8:29:25 AM (8 years ago)

Author:

vboxsync

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

116269

Message:

VMM: Nested Hw.virt: Fixes and debugger info support for VCPU hwvirt state.

File:

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

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

@@ -277 +277 @@
 static FNSVMEXITHANDLER hmR0SvmExitVmsave;
 static FNSVMEXITHANDLER hmR0SvmExitInvlpga;
+static FNSVMEXITHANDLER hmR0SvmExitVmrun;
 #endif
 /** @} */
@@ -589 +590 @@
     uint16_t offMsrpm;
     uint32_t uMsrpmBit;
-    int rc = hmSvmGetMsrpmOffsetAndBit(uMsr, &offMsrpm, &uMsrpmBit);
+    int rc = HMSvmGetMsrpmOffsetAndBit(uMsr, &offMsrpm, &uMsrpmBit);
     AssertRC(rc);
 
@@ -2440 +2441 @@
     uint8_t   uVector     = Event.n.u8Vector;
     uint8_t   uVectorType = Event.n.u3Type;
-    TRPMEVENT enmTrapType = hmSvmEventToTrpmEventType(&Event);
+    TRPMEVENT enmTrapType = HMSvmEventToTrpmEventType(&Event);
 
     Log4(("HM event->TRPM: uVector=%#x enmTrapType=%d\n", uVector, uVectorType));
@@ -2967 +2968 @@
     HMSVM_ASSERT_PREEMPT_SAFE();
 
-#ifdef VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
+#if defined(VBOX_WITH_NESTED_HWVIRT) && defined(VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM)
     /* Nested Hw. virt through SVM R0 execution is not yet implemented, IEM only, we shouldn't get here. */
     if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
+    {
+        Log2(("hmR0SvmPreRunGuest: Rescheduling to IEM due to nested-hwvirt or forced IEM exec -> VINF_EM_RESCHEDULE_REM\n"));
         return VINF_EM_RESCHEDULE_REM;
+    }
 #endif
 
@@ -3640 +3644 @@
                 case SVM_EXIT_VMSAVE:   return hmR0SvmExitVmsave(pVCpu, pCtx, pSvmTransient);
                 case SVM_EXIT_INVLPGA:  return hmR0SvmExitInvlpga(pVCpu, pCtx, pSvmTransient);
+                case SVM_EXIT_VMRUN:    return hmR0SvmExitVmrun(pVCpu, pCtx, pSvmTransient);
 #else
                 case SVM_EXIT_CLGI:
@@ -3646 +3651 @@
                 case SVM_EXIT_VMSAVE:
                 case SVM_EXIT_INVLPGA:
+                case SVM_EXIT_VMRUN:
 #endif
                 case SVM_EXIT_RSM:
-                case SVM_EXIT_VMRUN:
                 case SVM_EXIT_SKINIT:
                     return hmR0SvmExitSetPendingXcptUD(pVCpu, pCtx, pSvmTransient);
@@ -5809 +5814 @@
     return VBOXSTRICTRC_VAL(rcStrict);
 }
+
+
+/**
+ * \#VMEXIT handler for STGI (SVM_EXIT_VMRUN). Conditional \#VMEXIT.
+ */
+HMSVM_EXIT_DECL hmR0SvmExitVmrun(PVMCPU pVCpu, PCPUMCTX pCtx, PSVMTRANSIENT pSvmTransient)
+{
+    HMSVM_VALIDATE_EXIT_HANDLER_PARAMS();
+    /** @todo Stat. */
+    /* STAM_COUNTER_INC(&pVCpu->hm.s.StatExitVmrun); */
+    uint8_t const cbInstr = hmR0SvmGetInstrLengthHwAssist(pVCpu, pCtx, 3);
+    VBOXSTRICTRC rcStrict = IEMExecDecodedVmrun(pVCpu, cbInstr);
+    return VBOXSTRICTRC_VAL(rcStrict);
+}
 #endif /* VBOX_WITH_NESTED_HWVIRT */