Changeset 80150 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Aug 6, 2019 7:44:20 AM (5 years ago)

Author:

vboxsync

Message:

VMM: Kicking out 32-bit host support - VMX [drop VMCSCACHE]. bugref:9511

Location:

trunk/src/VBox/VMM/include

Files:

• HMInternal.h (modified) (4 diffs)
• HMInternal.mac (modified) (1 diff)

trunk/src/VBox/VMM/include/HMInternal.h

@@ -665 +665 @@
 AssertCompileMemberAlignment(HM, StatTprPatchSuccess, 8);
 
-/* Maximum number of cached entries. */
-#define VMX_VMCS_CACHE_MAX_ENTRY                    128
-
-/**
- * Cache of a VMCS for batch reads or writes.
- */
-typedef struct VMXVMCSCACHE
-{
-#ifdef VBOX_WITH_CRASHDUMP_MAGIC
-    /* Magic marker for searching in crash dumps. */
-    uint8_t         aMagic[16];
-    uint64_t        uMagic;
-    uint64_t        u64TimeEntry;
-    uint64_t        u64TimeSwitch;
-    uint64_t        cResume;
-    uint64_t        interPD;
-    uint64_t        pSwitcher;
-    uint32_t        uPos;
-    uint32_t        idCpu;
-#endif
-    /* CR2 is saved here for EPT syncing. */
-    uint64_t        cr2;
-    struct
-    {
-        uint32_t    cValidEntries;
-        uint32_t    uAlignment;
-        uint32_t    aField[VMX_VMCS_CACHE_MAX_ENTRY];
-        uint64_t    aFieldVal[VMX_VMCS_CACHE_MAX_ENTRY];
-    } Write;
-    struct
-    {
-        uint32_t    cValidEntries;
-        uint32_t    uAlignment;
-        uint32_t    aField[VMX_VMCS_CACHE_MAX_ENTRY];
-        uint64_t    aFieldVal[VMX_VMCS_CACHE_MAX_ENTRY];
-    } Read;
-#ifdef VBOX_STRICT
-    struct
-    {
-        RTHCPHYS    HCPhysCpuPage;
-        RTHCPHYS    HCPhysVmcs;
-        RTGCPTR     pCache;
-        RTGCPTR     pCtx;
-    } TestIn;
-    struct
-    {
-        RTHCPHYS    HCPhysVmcs;
-        RTGCPTR     pCache;
-        RTGCPTR     pCtx;
-        uint64_t    eflags;
-        uint64_t    cr8;
-    } TestOut;
-    struct
-    {
-        uint64_t    param1;
-        uint64_t    param2;
-        uint64_t    param3;
-        uint64_t    param4;
-    } ScratchPad;
-#endif
-} VMXVMCSCACHE;
-/** Pointer to VMXVMCSCACHE. */
-typedef VMXVMCSCACHE *PVMXVMCSCACHE;
-AssertCompileSizeAlignment(VMXVMCSCACHE, 8);
-
 /**
  * VMX StartVM function.
@@ -736 +671 @@
  * @param   fResume     Whether to use VMRESUME (true) or VMLAUNCH (false).
  * @param   pCtx        The CPU register context.
- * @param   pVmcsCache  The VMCS batch cache.
+ * @param   pvUnused    Unused argument.
  * @param   pVM         Pointer to the cross context VM structure.
  * @param   pVCpu       Pointer to the cross context per-CPU structure.
  */
-typedef DECLCALLBACK(int) FNHMVMXSTARTVM(RTHCUINT fResume, PCPUMCTX pCtx, PVMXVMCSCACHE pVmcsCache, PVM pVM, PVMCPU pVCpu);
+typedef DECLCALLBACK(int) FNHMVMXSTARTVM(RTHCUINT fResume, PCPUMCTX pCtx, void *pvUnused, PVM pVM, PVMCPU pVCpu);
 /** Pointer to a VMX StartVM function. */
 typedef R0PTRTYPE(FNHMVMXSTARTVM *) PFNHMVMXSTARTVM;
@@ -986 +921 @@
             /** Cached guest APIC-base MSR for identifying when to map the APIC-access page. */
             uint64_t                    u64GstMsrApicBase;
-            /** VMCS cache for batched vmread/vmwrites. */
-            VMXVMCSCACHE                VmcsCache;
             PGMPAGEMAPLOCK              PgMapLockVirtApic;
             /** @} */
@@ -1255 +1188 @@
 
 # ifdef VBOX_WITH_KERNEL_USING_XMM
-DECLASM(int)                hmR0VMXStartVMWrapXMM(RTHCUINT fResume, PCPUMCTX pCtx, PVMXVMCSCACHE pVmcsCache, PVM pVM,
-                                                  PVMCPU pVCpu, PFNHMVMXSTARTVM pfnStartVM);
+DECLASM(int)                hmR0VMXStartVMWrapXMM(RTHCUINT fResume, PCPUMCTX pCtx, void *pvUnused, PVM pVM, PVMCPU pVCpu,
+                                                  PFNHMVMXSTARTVM pfnStartVM);
 DECLASM(int)                hmR0SVMRunWrapXMM(RTHCPHYS pVmcbHostPhys, RTHCPHYS pVmcbPhys, PCPUMCTX pCtx, PVM pVM, PVMCPU pVCpu,
                                               PFNHMSVMVMRUN pfnVMRun);

trunk/src/VBox/VMM/include/HMInternal.mac

@@ -15 +15 @@
 ; hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
 ;
-
-;Maximum number of cached entries.
-%define VMX_VMCS_CACHE_MAX_ENTRY                             128
-
-; Structure for storing read and write VMCS actions.
-struc VMXVMCSCACHE
-%ifdef VBOX_WITH_CRASHDUMP_MAGIC
-    .aMagic                   resb    16
-    .uMagic                   resq    1
-    .u64TimeEntry             resq    1
-    .u64TimeSwitch            resq    1
-    .cResume                  resq    1
-    .interPD                  resq    1
-    .pSwitcher                resq    1
-    .uPos                     resd    1
-    .idCpu                    resd    1
-%endif
-    .cr2                      resq    1
-    .Write.cValidEntries      resd    1
-    .Write.uAlignment         resd    1
-    .Write.aField             resd    VMX_VMCS_CACHE_MAX_ENTRY
-    .Write.aFieldVal          resq    VMX_VMCS_CACHE_MAX_ENTRY
-    .Read.cValidEntries       resd    1
-    .Read.uAlignment          resd    1
-    .Read.aField              resd    VMX_VMCS_CACHE_MAX_ENTRY
-    .Read.aFieldVal           resq    VMX_VMCS_CACHE_MAX_ENTRY
-%ifdef VBOX_STRICT
-    .TestIn.HCPhysCpuPage     resq    1
-    .TestIn.HCPhysVmcs        resq    1
-    .TestIn.pCache            resq    1
-    .TestIn.pCtx              resq    1
-    .TestOut.HCPhysVmcs       resq    1
-    .TestOut.pCache           resq    1
-    .TestOut.pCtx             resq    1
-    .TestOut.eflags           resq    1
-    .TestOut.cr8              resq    1
-    .ScratchPad.param1        resq    1
-    .ScratchPad.param2        resq    1
-    .ScratchPad.param3        resq    1
-    .ScratchPad.param4        resq    1
-%endif
-endstruc
 
 struc HMCPU