Changeset 43657 in vbox for trunk/include/VBox

Timestamp:

Oct 16, 2012 3:34:05 PM (13 years ago)

Author:

vboxsync

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

81423

Message:

VMM: APIC refactor. Moved APIC base MSR to the VCPU (where it belongs) for lockless accesses.

Location:

trunk/include/VBox/vmm

Files:

• cpum.mac (modified) (3 diffs)
• cpumctx.h (modified) (1 diff)
• hm_vmx.h (modified) (1 diff)
• pdmapi.h (modified) (1 diff)
• pdmdev.h (modified) (5 diffs)

trunk/include/VBox/vmm/cpum.mac

@@ -4 +4 @@
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2012 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
@@ -194 +194 @@
     .msrSFMASK          resb    8
     .msrKERNELGSBASE    resb    8
-    .au32SizePadding    resb    32
+    .msrApicBase        resb    8
+    .au32SizePadding    resb    24
 endstruc
 
@@ -206 +207 @@
 
 %endif
+

trunk/include/VBox/vmm/cpumctx.h

@@ -400 +400 @@
     uint64_t        msrSFMASK;          /**< syscall flag mask. */
     uint64_t        msrKERNELGSBASE;    /**< swapgs exchange value. */
+    uint64_t        msrApicBase;        /**< The local APIC base (IA32_APIC_BASE MSR). */
     /** @} */
 
     /** Size padding. */
-    uint32_t        au32SizePadding[8];
+    uint32_t        au32SizePadding[6];
 } CPUMCTX;
 #pragma pack()

trunk/include/VBox/vmm/hm_vmx.h

@@ -429 +429 @@
     struct
     {
+        /** Bits set here -must- be set in the correpsonding VM-execution controls. */
         uint32_t        disallowed0;
+        /** Bits cleared here -must- be cleared in the corresponding VM-execution
+         *  controls. */
         uint32_t        allowed1;
     } n;

trunk/include/VBox/vmm/pdmapi.h

@@ -47 +47 @@
 VMMDECL(bool)       PDMHasIoApic(PVM pVM);
 VMMDECL(int)        PDMApicHasPendingIrq(PVM pVM, bool *pfPending);
-VMMDECL(int)        PDMApicSetBase(PVM pVM, uint64_t u64Base);
-VMMDECL(int)        PDMApicGetBase(PVM pVM, uint64_t *pu64Base);
+VMMDECL(int)        PDMApicSetBase(PVMCPU pVCpu, uint64_t u64Base);
+VMMDECL(int)        PDMApicGetBase(PVMCPU pVCpu, uint64_t *pu64Base);
+VMMDECL(int)        PDMApicGetBaseFromApic(PVMCPU pVCpu, uint64_t *pu64Base);
 VMMDECL(int)        PDMApicSetTPR(PVMCPU pVCpu, uint8_t u8TPR);
 VMMDECL(int)        PDMApicGetTPR(PVMCPU pVCpu, uint8_t *pu8TPR, bool *pfPending);

trunk/include/VBox/vmm/pdmdev.h

@@ -1078 +1078 @@
      * @returns Pending interrupt number.
      * @param   pDevIns         Device instance of the APIC.
+     * @param   idCpu           The VCPU Id.
      * @param   puTagSrc        Where to return the tag source.
      */
-    DECLR3CALLBACKMEMBER(int, pfnGetInterruptR3,(PPDMDEVINS pDevIns, uint32_t *puTagSrc));
+    DECLR3CALLBACKMEMBER(int, pfnGetInterruptR3,(PPDMDEVINS pDevIns, VMCPUID idCpu, uint32_t *puTagSrc));
 
     /**
@@ -1087 +1088 @@
      * @returns Pending interrupt yes/no
      * @param   pDevIns         Device instance of the APIC.
-     */
-    DECLR3CALLBACKMEMBER(bool, pfnHasPendingIrqR3,(PPDMDEVINS pDevIns));
+     * @param   idCpu           The VCPU Id.
+     */
+    DECLR3CALLBACKMEMBER(bool, pfnHasPendingIrqR3,(PPDMDEVINS pDevIns, VMCPUID idCpu));
 
     /**
@@ -1094 +1096 @@
      *
      * @param   pDevIns         Device instance of the APIC.
+     * @param   idCpu           The VCPU Id.
      * @param   u64Base         The new base.
      */
-    DECLR3CALLBACKMEMBER(void, pfnSetBaseR3,(PPDMDEVINS pDevIns, uint64_t u64Base));
+    DECLR3CALLBACKMEMBER(void, pfnSetBaseR3,(PPDMDEVINS pDevIns, VMCPUID idCpu, uint64_t u64Base));
 
     /**
@@ -1103 +1106 @@
      * @returns Current base.
      * @param   pDevIns         Device instance of the APIC.
-     */
-    DECLR3CALLBACKMEMBER(uint64_t, pfnGetBaseR3,(PPDMDEVINS pDevIns));
+     * @param   idCpu           The VCPU Id.
+     */
+    DECLR3CALLBACKMEMBER(uint64_t, pfnGetBaseR3,(PPDMDEVINS pDevIns, VMCPUID idCpu));
 
     /**
@@ -1110 +1114 @@
      *
      * @param   pDevIns         Device instance of the APIC.
-     * @param   idCpu           VCPU id
+     * @param   idCpu           The VCPU id.
      * @param   u8TPR           The new TPR.
      */