VirtualBox

Changeset 78951 in vbox for trunk/src/VBox/VMM/VMMAll


Ignore:
Timestamp:
Jun 4, 2019 7:41:40 AM (6 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
131074
Message:

VMM/IEM: Nested VMX: bugref:9180 APIC-access VM-exits to pass info. from HM. Replaced unused APIC-access memory VM-exit handler.

Location:
trunk/src/VBox/VMM/VMMAll
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

    r78920 r78951  
    1578815788
    1578915789    VBOXSTRICTRC rcStrict;
    15790     if (!fWrite)
     15790    if (fWrite)
     15791        rcStrict = iemVmxVirtApicAccessMsrWrite(pVCpu, idMsr, *pu64Value);
     15792    else
    1579115793        rcStrict = iemVmxVirtApicAccessMsrRead(pVCpu, idMsr, pu64Value);
    15792     else
    15793         rcStrict = iemVmxVirtApicAccessMsrWrite(pVCpu, idMsr, *pu64Value);
    15794     if (pVCpu->iem.s.cActiveMappings)
    15795         iemMemRollback(pVCpu);
     15794    Assert(!pVCpu->iem.s.cActiveMappings);
    1579615795    return iemExecStatusCodeFiddling(pVCpu, rcStrict);
    1579715796
    … …  
    1580715806 *
    1580815807 * @param   pVCpu       The cross context virtual CPU structure of the calling EMT.
    15809  * @param   offAccess   The offset of the register being accessed (within the
    15810  *                      APIC-access page).
    15811  * @param   cbAccess    The size of the access in bytes.
    15812  * @param   pvData      Pointer to the data being written or where to store the data
    15813  *                      being read.
    15814  * @param   fWrite      Whether this is a write or read access.
     15808 * @param   pExitInfo       Pointer to the VM-exit information.
     15809 * @param   pExitEventInfo  Pointer to the VM-exit event information.
    1581515810 * @thread  EMT(pVCpu)
    1581615811 */
    15817 VMM_INT_DECL(VBOXSTRICTRC) IEMExecVmxVirtApicAccessMem(PVMCPU pVCpu, uint16_t offAccess, size_t cbAccess, void *pvData,
    15818                                                        bool fWrite)
    15819 {
    15820     Assert(pvData);
    15821 
    15822     /** @todo NSTVMX: Unfortunately, the caller has no idea about instruction fetch
    15823      *        accesses, so we only use read/write here. Maybe in the future the PGM
    15824      *        physical handler will be extended to include this information? */
    15825     uint32_t const fAccess = fWrite ? IEM_ACCESS_TYPE_WRITE : IEM_ACCESS_TYPE_READ;
    15826     VBOXSTRICTRC rcStrict = iemVmxVirtApicAccessMem(pVCpu, offAccess, cbAccess, pvData, fAccess);
    15827     if (pVCpu->iem.s.cActiveMappings)
    15828         iemMemRollback(pVCpu);
     15812VMM_INT_DECL(VBOXSTRICTRC) IEMExecVmxVmexitApicAccess(PVMCPU pVCpu, PCVMXVEXITINFO pExitInfo, PCVMXVEXITEVENTINFO pExitEventInfo)
     15813{
     15814    Assert(pExitInfo);
     15815    Assert(pExitEventInfo);
     15816    VBOXSTRICTRC rcStrict = iemVmxVmexitApicAccessWithInfo(pVCpu, pExitInfo, pExitEventInfo);
     15817    Assert(!pVCpu->iem.s.cActiveMappings);
    1582915818    return iemExecStatusCodeFiddling(pVCpu, rcStrict);
     15819
    1583015820}
    1583115821
    … …  
    1584215832{
    1584315833    VBOXSTRICTRC rcStrict = iemVmxApicWriteEmulation(pVCpu);
    15844     if (pVCpu->iem.s.cActiveMappings)
    15845         iemMemRollback(pVCpu);
     15834    Assert(!pVCpu->iem.s.cActiveMappings);
    1584615835    return iemExecStatusCodeFiddling(pVCpu, rcStrict);
    1584715836}
    … …  
    1585815847{
    1585915848    VBOXSTRICTRC rcStrict = iemVmxVmexitPreemptTimer(pVCpu);
    15860     if (pVCpu->iem.s.cActiveMappings)
    15861         iemMemRollback(pVCpu);
     15849    Assert(!pVCpu->iem.s.cActiveMappings);
    1586215850    return iemExecStatusCodeFiddling(pVCpu, rcStrict);
    1586315851}
    … …  
    1587815866{
    1587915867    VBOXSTRICTRC rcStrict = iemVmxVmexitExtInt(pVCpu, uVector, fIntPending);
    15880     if (pVCpu->iem.s.cActiveMappings)
    15881         iemMemRollback(pVCpu);
     15868    Assert(!pVCpu->iem.s.cActiveMappings);
    1588215869    return iemExecStatusCodeFiddling(pVCpu, rcStrict);
    1588315870}
    … …  
    1589415881{
    1589515882    VBOXSTRICTRC rcStrict = iemVmxVmexitNmi(pVCpu);
    15896     if (pVCpu->iem.s.cActiveMappings)
    15897         iemMemRollback(pVCpu);
     15883    Assert(!pVCpu->iem.s.cActiveMappings);
    1589815884    return iemExecStatusCodeFiddling(pVCpu, rcStrict);
    1589915885}
    … …  
    1591015896{
    1591115897    VBOXSTRICTRC rcStrict = iemVmxVmexitTripleFault(pVCpu);
    15912     if (pVCpu->iem.s.cActiveMappings)
    15913         iemMemRollback(pVCpu);
     15898    Assert(!pVCpu->iem.s.cActiveMappings);
    1591415899    return iemExecStatusCodeFiddling(pVCpu, rcStrict);
    1591515900}
    … …  
    1592715912{
    1592815913    VBOXSTRICTRC rcStrict = iemVmxVmexitStartupIpi(pVCpu, uVector);
    15929     if (pVCpu->iem.s.cActiveMappings)
    15930         iemMemRollback(pVCpu);
     15914    Assert(!pVCpu->iem.s.cActiveMappings);
    1593115915    return iemExecStatusCodeFiddling(pVCpu, rcStrict);
    1593215916}
    … …  
    1594815932    iemVmxVmcsSetExitQual(pVCpu, uExitQual);
    1594915933    VBOXSTRICTRC rcStrict = iemVmxVmexit(pVCpu, uExitReason);
    15950     if (pVCpu->iem.s.cActiveMappings)
    15951         iemMemRollback(pVCpu);
     15934    Assert(!pVCpu->iem.s.cActiveMappings);
    1595215935    return iemExecStatusCodeFiddling(pVCpu, rcStrict);
    1595315936}
    … …  
    1596815951{
    1596915952    VBOXSTRICTRC rcStrict = iemVmxVmexitInstrWithInfo(pVCpu, pExitInfo);
    15970     if (pVCpu->iem.s.cActiveMappings)
    15971         iemMemRollback(pVCpu);
     15953    Assert(!pVCpu->iem.s.cActiveMappings);
    1597215954    return iemExecStatusCodeFiddling(pVCpu, rcStrict);
    1597315955}
    … …  
    1598915971{
    1599015972    VBOXSTRICTRC rcStrict = iemVmxVmexitInstr(pVCpu, uExitReason, cbInstr);
    15991     if (pVCpu->iem.s.cActiveMappings)
    15992         iemMemRollback(pVCpu);
     15973    Assert(!pVCpu->iem.s.cActiveMappings);
    1599315974    return iemExecStatusCodeFiddling(pVCpu, rcStrict);
    1599415975}
    … …  
    1600415985 * @thread  EMT(pVCpu)
    1600515986 */
    16006 VMM_INT_DECL(VBOXSTRICTRC) IEMExecVmxVmexitTaskSwitch(PVMCPU pVCpu, PVMXVEXITINFO pExitInfo, PVMXVEXITEVENTINFO pExitEventInfo)
     15987VMM_INT_DECL(VBOXSTRICTRC) IEMExecVmxVmexitTaskSwitch(PVMCPU pVCpu, PCVMXVEXITINFO pExitInfo, PCVMXVEXITEVENTINFO pExitEventInfo)
    1600715988{
    1600815989    VBOXSTRICTRC rcStrict = iemVmxVmexitTaskSwitchWithInfo(pVCpu, pExitInfo, pExitEventInfo);
    16009     if (pVCpu->iem.s.cActiveMappings)
    16010         iemMemRollback(pVCpu);
     15990    Assert(!pVCpu->iem.s.cActiveMappings);
    1601115991    return iemExecStatusCodeFiddling(pVCpu, rcStrict);
    1601215992}

  • trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

    r78927 r78951  
    36913691 * @param   pExitEventInfo      Pointer to the VM-exit event information.
    36923692 */
    3693 IEM_STATIC VBOXSTRICTRC iemVmxVmexitTaskSwitchWithInfo(PVMCPU pVCpu, PVMXVEXITINFO pExitInfo, PVMXVEXITEVENTINFO pExitEventInfo)
     3693IEM_STATIC VBOXSTRICTRC iemVmxVmexitTaskSwitchWithInfo(PVMCPU pVCpu, PCVMXVEXITINFO pExitInfo,
     3694                                                       PCVMXVEXITEVENTINFO pExitEventInfo)
    36943695{
    36953696    Assert(pExitInfo);
    … …  
    41054106
    41064107/**
    4107  * VMX VM-exit handler for APIC-accesses.
     4108 * VMX VM-exit handler for APIC accesses.
    41084109 *
    41094110 * @param   pVCpu       The cross context virtual CPU structure.
    … …  
    41304131                             | RT_BF_MAKE(VMX_BF_EXIT_QUAL_APIC_ACCESS_TYPE,   enmAccess);
    41314132    iemVmxVmcsSetExitQual(pVCpu, uExitQual);
     4133    return iemVmxVmexit(pVCpu, VMX_EXIT_APIC_ACCESS);
     4134}
     4135
     4136
     4137/**
     4138 * VMX VM-exit handler for APIC accesses.
     4139 *
     4140 * This is intended for APIC accesses where the caller provides all the
     4141 * relevant VM-exit information.
     4142 *
     4143 * @returns VBox strict status code.
     4144 * @param   pVCpu               The cross context virtual CPU structure.
     4145 * @param   pExitInfo           Pointer to the VM-exit information.
     4146 * @param   pExitEventInfo      Pointer to the VM-exit event information.
     4147 */
     4148IEM_STATIC VBOXSTRICTRC iemVmxVmexitApicAccessWithInfo(PVMCPU pVCpu, PCVMXVEXITINFO pExitInfo,
     4149                                                       PCVMXVEXITEVENTINFO pExitEventInfo)
     4150{
     4151    Assert(pExitInfo);
     4152    Assert(pExitEventInfo);
     4153
     4154    /* VM-exit interruption information should not be valid for APIC-access VM-exits. */
     4155    Assert(!VMX_EXIT_INT_INFO_IS_VALID(pExitEventInfo->uExitIntInfo));
     4156    iemVmxVmcsSetExitIntInfo(pVCpu, 0);
     4157    iemVmxVmcsSetExitIntErrCode(pVCpu, 0);
     4158    iemVmxVmcsSetExitQual(pVCpu, pExitInfo->u64Qual);
     4159    iemVmxVmcsSetIdtVectoringInfo(pVCpu, pExitEventInfo->uIdtVectoringInfo);
     4160    iemVmxVmcsSetIdtVectoringErrCode(pVCpu, pExitEventInfo->uIdtVectoringErrCode);
    41324161    return iemVmxVmexit(pVCpu, VMX_EXIT_APIC_ACCESS);
    41334162}
    … …  
    45404569    }
    45414570
    4542     /* The APIC-access is virtualized, does not cause a VM-exit. */
     4571    /* The APIC access is virtualized, does not cause a VM-exit. */
    45434572    return false;
    45444573}
    … …  
    45464575
    45474576/**
    4548  * Virtualizes a memory-based APIC-access where the address is not used to access
     4577 * Virtualizes a memory-based APIC access where the address is not used to access
    45494578 * memory.
    45504579 *
    … …  
    45844613
    45854614/**
    4586  * Virtualizes a memory-based APIC-access.
     4615 * Virtualizes a memory-based APIC access.
    45874616 *
    45884617 * @returns VBox strict status code.
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette