Changeset 60804 in vbox for trunk/include

Timestamp:

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

Author:

vboxsync

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/include/VBox/vmm

Files:

• apic.h (modified) (1 diff)
• pdmapi.h (modified) (1 diff)
• pdmdev.h (modified) (1 diff)
• vm.h (modified) (5 diffs)

trunk/include/VBox/vmm/apic.h

@@ -901 +901 @@
 AssertCompileMemberOffset(X2APICPAGE, self_ipi,    X2APIC_OFF_SELF_IPI);
 
-/**
- * APIC Pending Interrupt Bitmap (PIB).
- * @note This structure is used in saved-state, careful with changing layout or
- *       size!
- */
-typedef struct APICPIB
-{
-    uint64_t volatile aVectorBitmap[4];
-    uint32_t volatile fOutstandingNotification;
-    uint8_t           au8Reserved[28];
-} APICPIB;
-AssertCompileMemberOffset(APICPIB, fOutstandingNotification, 256 / 8);
-AssertCompileSize(APICPIB, 64);
-/** Pointer to a pending interrupt bitmap. */
-typedef APICPIB *PAPICPIB;
-/** Pointer to a const pending interrupt bitmap. */
-typedef const APICPIB *PCAPICPIB;
-
 RT_C_DECLS_BEGIN
 

trunk/include/VBox/vmm/pdmapi.h

@@ -53 +53 @@
 VMMDECL(VBOXSTRICTRC)   PDMApicSetBaseMsr(PVMCPU pVCpu, uint64_t u64Base);
 VMMDECL(VBOXSTRICTRC)   PDMApicGetBaseMsr(PVMCPU pVCpu, uint64_t *pu64Base, bool fIgnoreErrors);
+VMMDECL(void)           PDMApicUpdateInterrupts(PVMCPU pVCpu);
 VMMDECL(int)            PDMApicSetTPR(PVMCPU pVCpu, uint8_t u8TPR);
 VMMDECL(int)            PDMApicGetTPR(PVMCPU pVCpu, uint8_t *pu8TPR, bool *pfPending, uint8_t *pu8PendingIntr);

trunk/include/VBox/vmm/pdmdev.h

@@ -1369 +1369 @@
     /** ExtINT (HW interrupt via PIC). */
     PDMAPICIRQ_EXTINT,
+    /** Interrupt arrived, needs to be updated to the IRR. */
+    PDMAPICIRQ_UPDATE_PENDING,
     /** The usual 32-bit paranoia. */
     PDMAPICIRQ_32BIT_HACK = 0x7fffffff

trunk/include/VBox/vmm/vm.h

@@ -132 +132 @@
      *          data could be lumped together at the end with a < 64 byte padding
      *          following it (to grow into and align the struct size).
-     *   */
+     */
     uint8_t                 abAlignment1[HC_ARCH_BITS == 64 ? 56 : 12+64];
     /** State data for use by ad hoc profiling. */
@@ -372 +372 @@
 
 
-/** This action forces the VM to check any pending interrups on the APIC. */
+/** This action forces the VM to check any pending interrupts on the APIC. */
 #define VMCPU_FF_INTERRUPT_APIC             RT_BIT_32(0)
 /** This action forces the VM to check any pending interrups on the PIC. */
@@ -393 +393 @@
 /** Pending IEM action (mask). */
 #define VMCPU_FF_IEM                        RT_BIT_32(VMCPU_FF_IEM_BIT)
+/** Pending APIC action (bit number). */
+#define VMCPU_FF_UPDATE_APIC_BIT            8
+/** This action forces the VM to update APIC's asynchronously arrived
+ *  interrupts as pending interrupts. */
+#define VMCPU_FF_UPDATE_APIC                RT_BIT_32(VMCPU_FF_UPDATE_APIC_BIT)
+
 /** This action forces the VM to service pending requests from other
  * thread or requests which must be executed in another context. */
@@ -450 +456 @@
                                                  | VM_FF_PDM_QUEUES | VM_FF_PDM_DMA | VM_FF_EMT_RENDEZVOUS)
 /** Externally forced VMCPU actions. Used to quit the idle/wait loop. */
-#define VMCPU_FF_EXTERNAL_HALTED_MASK           (  VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC | VMCPU_FF_REQUEST \
-                                                 | VMCPU_FF_INTERRUPT_NMI  | VMCPU_FF_INTERRUPT_SMI | VMCPU_FF_UNHALT \
-                                                 | VMCPU_FF_TIMER)
+#define VMCPU_FF_EXTERNAL_HALTED_MASK           (  VMCPU_FF_UPDATE_APIC | VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC \
+                                                 | VMCPU_FF_REQUEST     | VMCPU_FF_INTERRUPT_NMI | VMCPU_FF_INTERRUPT_SMI \
+                                                 | VMCPU_FF_UNHALT      | VMCPU_FF_TIMER)
 
 /** High priority VM pre-execution actions. */
@@ -460 +466 @@
 /** High priority VMCPU pre-execution actions. */
 #define VMCPU_FF_HIGH_PRIORITY_PRE_MASK         (  VMCPU_FF_TIMER | VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC \
+                                                 | VMCPU_FF_UPDATE_APIC \
                                                  | VMCPU_FF_PGM_SYNC_CR3 | VMCPU_FF_PGM_SYNC_CR3_NON_GLOBAL \
                                                  | VMCPU_FF_INHIBIT_INTERRUPTS \