Changeset 60804 in vbox for trunk/src/VBox/VMM/VMMRC

Timestamp:

May 3, 2016 2:13:51 PM (9 years ago)

Author:

vboxsync

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

107007

Message:

VMM: Introduced the new APIC update force-flag and relevant fixes, Win8.1 SMP boots now.
VMM/HMVMXR0: Fixed the HLT exit to use instruction length and also keep the INHIBIT force-flag
more in sync with the VT-x's guest-interruptibility state.

Location:

trunk/src/VBox/VMM/VMMRC

Files:

• PDMRCDevice.cpp (modified) (2 diffs)
• TRPMRCHandlers.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMRC/PDMRCDevice.cpp

@@ -506 +506 @@
     switch (enmType)
     {
+        case PDMAPICIRQ_UPDATE_PENDING:
+            VMCPU_FF_SET(pVCpu, VMCPU_FF_UPDATE_APIC);
+            break;
         case PDMAPICIRQ_HARDWARE:
             VMCPU_FF_SET(pVCpu, VMCPU_FF_INTERRUPT_APIC);
@@ -542 +545 @@
         case PDMAPICIRQ_HARDWARE:
             VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_APIC);
+            break;
+        case PDMAPICIRQ_UPDATE_PENDING:
+            VMCPU_ASSERT_EMT_OR_NOT_RUNNING(pVCpu);
+            VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_UPDATE_APIC);
             break;
         case PDMAPICIRQ_EXTINT:

trunk/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp

@@ -214 +214 @@
     if (    rc == VINF_SUCCESS
         &&  (   VM_FF_IS_PENDING(pVM, VM_FF_TM_VIRTUAL_SYNC | VM_FF_REQUEST | VM_FF_PGM_NO_MEMORY | VM_FF_PDM_DMA)
-             || VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_TIMER | VMCPU_FF_TO_R3 | VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC
-                                          | VMCPU_FF_REQUEST | VMCPU_FF_PGM_SYNC_CR3 | VMCPU_FF_PGM_SYNC_CR3_NON_GLOBAL
-                                          | VMCPU_FF_PDM_CRITSECT
-                                          | VMCPU_FF_IEM
-                                          | VMCPU_FF_SELM_SYNC_GDT | VMCPU_FF_SELM_SYNC_LDT
-                                          | VMCPU_FF_SELM_SYNC_TSS | VMCPU_FF_TRPM_SYNC_IDT
+             || VMCPU_FF_IS_PENDING(pVCpu,  VMCPU_FF_TIMER         | VMCPU_FF_TO_R3
+                                          | VMCPU_FF_UPDATE_APIC   | VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC
+                                          | VMCPU_FF_REQUEST       | VMCPU_FF_PGM_SYNC_CR3   | VMCPU_FF_PGM_SYNC_CR3_NON_GLOBAL
+                                          | VMCPU_FF_PDM_CRITSECT  | VMCPU_FF_IEM            | VMCPU_FF_SELM_SYNC_GDT
+                                          | VMCPU_FF_SELM_SYNC_LDT | VMCPU_FF_SELM_SYNC_TSS  | VMCPU_FF_TRPM_SYNC_IDT
                                    )
             )
@@ -227 +226 @@
         if (RT_UNLIKELY(VM_FF_IS_PENDING(pVM, VM_FF_PGM_NO_MEMORY)))
             rc = VINF_EM_NO_MEMORY;
-        /* Pending Ring-3 action. */
-        else if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_TO_R3 | VMCPU_FF_PDM_CRITSECT | VMCPU_FF_IEM))
-        {
-            VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_TO_R3);
-            rc = VINF_EM_RAW_TO_R3;
-        }
-        /* Pending timer action. */
-        else if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_TIMER))
-            rc = VINF_EM_RAW_TIMER_PENDING;
-        /* The Virtual Sync clock has stopped. */
-        else if (VM_FF_IS_PENDING(pVM, VM_FF_TM_VIRTUAL_SYNC))
-            rc = VINF_EM_RAW_TO_R3;
-        /* DMA work pending? */
-        else if (VM_FF_IS_PENDING(pVM, VM_FF_PDM_DMA))
-            rc = VINF_EM_RAW_TO_R3;
-        /* Pending request packets might contain actions that need immediate
-           attention, such as pending hardware interrupts. */
-        else if (   VM_FF_IS_PENDING(pVM, VM_FF_REQUEST)
-                 || VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_REQUEST))
-            rc = VINF_EM_PENDING_REQUEST;
-        /* Pending GDT/LDT/TSS sync. */
-        else if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_SELM_SYNC_GDT | VMCPU_FF_SELM_SYNC_LDT | VMCPU_FF_SELM_SYNC_TSS))
-            rc = VINF_SELM_SYNC_GDT;
-        else if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_TRPM_SYNC_IDT))
-            rc = VINF_EM_RAW_TO_R3;
-        /* Possibly pending interrupt: dispatch it. */
-        else if (    VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC)
-                 && !VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS)
-                 &&  PATMAreInterruptsEnabledByCtx(pVM, CPUMCTX_FROM_CORE(pRegFrame))
-           )
+        else
         {
 #ifdef VBOX_WITH_NEW_APIC
-            /* The EFLAGS are checked in TRPMForwardTrap() below. */
-            if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INTERRUPT_APIC))
+            /* APIC needs updating. */
+            if (VMCPU_FF_TEST_AND_CLEAR(pVCpu, VMCPU_FF_UPDATE_APIC))
                 APICUpdatePendingInterrupts(pVCpu);
 #endif
-            uint8_t u8Interrupt;
-            rc = PDMGetInterrupt(pVCpu, &u8Interrupt);
-            Log(("trpmGCExitTrap: u8Interrupt=%d (%#x) rc=%Rrc\n", u8Interrupt, u8Interrupt, rc));
-            if (RT_SUCCESS(rc))
+            /* Pending Ring-3 action. */
+            if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_TO_R3 | VMCPU_FF_PDM_CRITSECT | VMCPU_FF_IEM))
             {
-                rc = TRPMForwardTrap(pVCpu, pRegFrame, (uint32_t)u8Interrupt, 0, TRPM_TRAP_NO_ERRORCODE, TRPM_HARDWARE_INT, uOldActiveVector);
-                /* can't return if successful */
-                Assert(rc != VINF_SUCCESS);
-
-                /* Stop the profile counter that was started in TRPMRCHandlersA.asm */
-                Assert(uOldActiveVector <= 16);
-                STAM_PROFILE_ADV_STOP(&pVM->trpm.s.aStatGCTraps[uOldActiveVector], a);
-
-                /* Assert the trap and go to the recompiler to dispatch it. */
-                TRPMAssertTrap(pVCpu, u8Interrupt, TRPM_HARDWARE_INT);
-
-                STAM_PROFILE_ADV_START(&pVM->trpm.s.aStatGCTraps[uOldActiveVector], a);
-                rc = VINF_EM_RAW_INTERRUPT_PENDING;
+                VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_TO_R3);
+                rc = VINF_EM_RAW_TO_R3;
             }
-            else if (   rc == VERR_APIC_INTR_MASKED_BY_TPR  /* Can happen if TPR is too high for the newly arrived interrupt. */
-                     || rc == VERR_NO_DATA)                 /* Can happen if the APIC is disabled. */
+            /* Pending timer action. */
+            else if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_TIMER))
+                rc = VINF_EM_RAW_TIMER_PENDING;
+            /* The Virtual Sync clock has stopped. */
+            else if (VM_FF_IS_PENDING(pVM, VM_FF_TM_VIRTUAL_SYNC))
+                rc = VINF_EM_RAW_TO_R3;
+            /* DMA work pending? */
+            else if (VM_FF_IS_PENDING(pVM, VM_FF_PDM_DMA))
+                rc = VINF_EM_RAW_TO_R3;
+            /* Pending request packets might contain actions that need immediate
+               attention, such as pending hardware interrupts. */
+            else if (   VM_FF_IS_PENDING(pVM, VM_FF_REQUEST)
+                     || VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_REQUEST))
+                rc = VINF_EM_PENDING_REQUEST;
+            /* Pending GDT/LDT/TSS sync. */
+            else if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_SELM_SYNC_GDT | VMCPU_FF_SELM_SYNC_LDT | VMCPU_FF_SELM_SYNC_TSS))
+                rc = VINF_SELM_SYNC_GDT;
+            else if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_TRPM_SYNC_IDT))
+                rc = VINF_EM_RAW_TO_R3;
+            /* Possibly pending interrupt: dispatch it. */
+            else if (    VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC)
+                     && !VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS)
+                     &&  PATMAreInterruptsEnabledByCtx(pVM, CPUMCTX_FROM_CORE(pRegFrame))
+               )
             {
-                STAM_PROFILE_ADV_STOP(&pVM->trpm.s.aStatGCTraps[uOldActiveVector], a);
-                rc = VINF_SUCCESS;
+                uint8_t u8Interrupt;
+                rc = PDMGetInterrupt(pVCpu, &u8Interrupt);
+                Log(("trpmGCExitTrap: u8Interrupt=%d (%#x) rc=%Rrc\n", u8Interrupt, u8Interrupt, rc));
+                if (RT_SUCCESS(rc))
+                {
+                    rc = TRPMForwardTrap(pVCpu, pRegFrame, (uint32_t)u8Interrupt, 0, TRPM_TRAP_NO_ERRORCODE, TRPM_HARDWARE_INT, uOldActiveVector);
+                    /* can't return if successful */
+                    Assert(rc != VINF_SUCCESS);
+
+                    /* Stop the profile counter that was started in TRPMRCHandlersA.asm */
+                    Assert(uOldActiveVector <= 16);
+                    STAM_PROFILE_ADV_STOP(&pVM->trpm.s.aStatGCTraps[uOldActiveVector], a);
+
+                    /* Assert the trap and go to the recompiler to dispatch it. */
+                    TRPMAssertTrap(pVCpu, u8Interrupt, TRPM_HARDWARE_INT);
+
+                    STAM_PROFILE_ADV_START(&pVM->trpm.s.aStatGCTraps[uOldActiveVector], a);
+                    rc = VINF_EM_RAW_INTERRUPT_PENDING;
+                }
+                else if (   rc == VERR_APIC_INTR_MASKED_BY_TPR  /* Can happen if TPR is too high for the newly arrived interrupt. */
+                         || rc == VERR_NO_DATA)                 /* Can happen if the APIC is disabled. */
+                {
+                    STAM_PROFILE_ADV_STOP(&pVM->trpm.s.aStatGCTraps[uOldActiveVector], a);
+                    rc = VINF_SUCCESS;
+                }
+                else
+                    AssertFatalMsgRC(rc, ("PDMGetInterrupt failed. rc=%Rrc\n", rc));
             }
-            else
-                AssertFatalMsgRC(rc, ("PDMGetInterrupt failed. rc=%Rrc\n", rc));
-        }
-        /*
-         * Try sync CR3?
-         */
-        else if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_PGM_SYNC_CR3 | VMCPU_FF_PGM_SYNC_CR3_NON_GLOBAL))
-        {
+            /*
+             * Try sync CR3?
+             */
+            else if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_PGM_SYNC_CR3 | VMCPU_FF_PGM_SYNC_CR3_NON_GLOBAL))
+            {
 #if 1
-            PGMRZDynMapReleaseAutoSet(pVCpu);
-            PGMRZDynMapStartAutoSet(pVCpu);
-            rc = PGMSyncCR3(pVCpu, CPUMGetGuestCR0(pVCpu), CPUMGetGuestCR3(pVCpu), CPUMGetGuestCR4(pVCpu), VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_PGM_SYNC_CR3));
+                PGMRZDynMapReleaseAutoSet(pVCpu);
+                PGMRZDynMapStartAutoSet(pVCpu);
+                rc = PGMSyncCR3(pVCpu, CPUMGetGuestCR0(pVCpu), CPUMGetGuestCR3(pVCpu), CPUMGetGuestCR4(pVCpu), VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_PGM_SYNC_CR3));
 #else
-            rc = VINF_PGM_SYNC_CR3;
+                rc = VINF_PGM_SYNC_CR3;
 #endif
+            }
         }
     }