mirror of https://gitee.com/openkylin/linux.git
KVM: VMX: Handle INVVPID fallback logic in vpid_sync_vcpu_addr()
Directly invoke vpid_sync_context() to do a global INVVPID when the individual address variant is not supported instead of deferring such behavior to the caller. This allows for additional consolidation of code as the logic is basically identical to the emulation of the individual address variant in handle_invvpid(). No functional change intended. Reviewed-by: Miaohe Lin <linmiaohe@huawei.com> Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> Message-Id: <20200320212833.3507-12-sean.j.christopherson@intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
8a8b097c6c
commit
ab4b3597ff
|
@ -291,17 +291,15 @@ static inline void vpid_sync_context(int vpid)
|
||||||
vpid_sync_vcpu_global();
|
vpid_sync_vcpu_global();
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool vpid_sync_vcpu_addr(int vpid, gva_t addr)
|
static inline void vpid_sync_vcpu_addr(int vpid, gva_t addr)
|
||||||
{
|
{
|
||||||
if (vpid == 0)
|
if (vpid == 0)
|
||||||
return true;
|
return;
|
||||||
|
|
||||||
if (cpu_has_vmx_invvpid_individual_addr()) {
|
if (cpu_has_vmx_invvpid_individual_addr())
|
||||||
__invvpid(VMX_VPID_EXTENT_INDIVIDUAL_ADDR, vpid, addr);
|
__invvpid(VMX_VPID_EXTENT_INDIVIDUAL_ADDR, vpid, addr);
|
||||||
return true;
|
else
|
||||||
}
|
vpid_sync_context(vpid);
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void ept_sync_global(void)
|
static inline void ept_sync_global(void)
|
||||||
|
|
|
@ -2842,8 +2842,7 @@ static void vmx_flush_tlb_gva(struct kvm_vcpu *vcpu, gva_t addr)
|
||||||
{
|
{
|
||||||
int vpid = to_vmx(vcpu)->vpid;
|
int vpid = to_vmx(vcpu)->vpid;
|
||||||
|
|
||||||
if (!vpid_sync_vcpu_addr(vpid, addr))
|
vpid_sync_vcpu_addr(vpid, addr);
|
||||||
vpid_sync_context(vpid);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If VPIDs are not supported or enabled, then the above is a no-op.
|
* If VPIDs are not supported or enabled, then the above is a no-op.
|
||||||
|
|
Loading…
Reference in New Issue