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

Timestamp:

Jun 4, 2019 10:35:45 AM (6 years ago)

Author:

vboxsync

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

131083

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Software interrupts cannot cause VM-exits directly.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (5 diffs)

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

@@ -14064 +14064 @@
     switch (uAccessType)
     {
-        case VMX_EXIT_QUAL_CRX_ACCESS_WRITE:       /* MOV to CRx */
+        /*
+         * MOV to CRx.
+         */
+        case VMX_EXIT_QUAL_CRX_ACCESS_WRITE:
         {
             rc = hmR0VmxImportGuestState(pVCpu, pVmcsInfo, IEM_CPUMCTX_EXTRN_MUST_MASK);
@@ -14118 +14121 @@
         }
 
-        case VMX_EXIT_QUAL_CRX_ACCESS_READ:        /* MOV from CRx */
+        /*
+         * MOV from CRx.
+         */
+        case VMX_EXIT_QUAL_CRX_ACCESS_READ:
         {
             uint8_t const iGReg  = VMX_EXIT_QUAL_CRX_GENREG(uExitQual);
@@ -14142 +14148 @@
         }
 
+        /*
+         * CLTS (Clear Task-Switch Flag in CR0).
+         */
         case VMX_EXIT_QUAL_CRX_ACCESS_CLTS:
         {
-            /*
-             * CLTS (Clear Task-Switch Flag in CR0).
-             */
             rcStrict = hmR0VmxExitClts(pVCpu, pVmcsInfo, pVmxTransient->cbInstr);
             break;
         }
 
+        /*
+         * LMSW (Load Machine-Status Word into CR0).
+         * LMSW cannot clear CR0.PE, so no fRealOnV86Active kludge needed here.
+         */
         case VMX_EXIT_QUAL_CRX_ACCESS_LMSW:
         {
-            /*
-             * LMSW (Load Machine-Status Word into CR0).
-             * LMSW cannot clear CR0.PE, so no fRealOnV86Active kludge needed here.
-             */
             RTGCPTR        GCPtrEffDst;
             uint8_t const  cbInstr     = pVmxTransient->cbInstr;
@@ -15795 +15801 @@
     AssertRCReturn(rc, rc);
 
-    Assert(VMX_EXIT_INT_INFO_IS_VALID(pVmxTransient->uExitIntInfo));
-    uint32_t const uExtIntType = VMX_EXIT_INT_INFO_TYPE(pVmxTransient->uExitIntInfo);
+    uint64_t const uExitIntInfo = pVmxTransient->uExitIntInfo;
+    Assert(VMX_EXIT_INT_INFO_IS_VALID(uExitIntInfo));
+    uint32_t const uExtIntType = VMX_EXIT_INT_INFO_TYPE(uExitIntInfo);
 
     switch (uExtIntType)
@@ -15828 +15835 @@
 
         /*
-         * This should only happen when "acknowledge external interrupts on VM-exit" is set.
-         * We don't set it when executing guests or nested-guests.
+         * External interrupts:
+         *    This should only happen when "acknowledge external interrupts on VM-exit" control is set.
+         *    However, we don't set it when executing guests or nested-guests. For nested-guests it is
+         *    emulated while injecting interrupts into the guest.
+         *
+         * Software interrupts:
+         *    VM-exits cannot be caused by software interrupts.
          */
         case VMX_EXIT_INT_INFO_TYPE_EXT_INT:
-            RT_FALL_THRU();
+        case VMX_EXIT_INT_INFO_TYPE_SW_INT:
         default:
         {