openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Sean Christopherson 2020-03-20 14:28:07 -07:00 committed by Paolo Bonzini
parent 8a8b097c6c
commit ab4b3597ff
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/x86/kvm/vmx/ops.h
View File

@ -291,17 +291,15 @@ static inline void vpid_sync_context(int vpid)
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)
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);
return true;
}
return false;
else
vpid_sync_context(vpid);
}
static inline void ept_sync_global(void)

3
arch/x86/kvm/vmx/vmx.c
View File

@ -2842,8 +2842,7 @@ static void vmx_flush_tlb_gva(struct kvm_vcpu *vcpu, gva_t addr)
{
int vpid = to_vmx(vcpu)->vpid;
if (!vpid_sync_vcpu_addr(vpid, addr))
vpid_sync_context(vpid);
vpid_sync_vcpu_addr(vpid, addr);
/*
* If VPIDs are not supported or enabled, then the above is a no-op.