lkml.org 
[lkml]   [2015]   [Sep]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[FYI PATCH 17/20] KVM: VMX: introduce __vmx_flush_tlb to handle specific vpid
    Date
    From: Wanpeng Li <wanpeng.li@hotmail.com>

    Introduce __vmx_flush_tlb() to handle specific vpid.

    Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com>
    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
    ---
    arch/x86/kvm/vmx.c | 21 +++++++++++++--------
    1 file changed, 13 insertions(+), 8 deletions(-)

    diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
    index 656074153f49..e1cb4aa026a2 100644
    --- a/arch/x86/kvm/vmx.c
    +++ b/arch/x86/kvm/vmx.c
    @@ -1337,13 +1337,13 @@ static void loaded_vmcs_clear(struct loaded_vmcs *loaded_vmcs)
    __loaded_vmcs_clear, loaded_vmcs, 1);
    }

    -static inline void vpid_sync_vcpu_single(struct vcpu_vmx *vmx)
    +static inline void vpid_sync_vcpu_single(int vpid)
    {
    - if (vmx->vpid == 0)
    + if (vpid == 0)
    return;

    if (cpu_has_vmx_invvpid_single())
    - __invvpid(VMX_VPID_EXTENT_SINGLE_CONTEXT, vmx->vpid, 0);
    + __invvpid(VMX_VPID_EXTENT_SINGLE_CONTEXT, vpid, 0);
    }

    static inline void vpid_sync_vcpu_global(void)
    @@ -1352,10 +1352,10 @@ static inline void vpid_sync_vcpu_global(void)
    __invvpid(VMX_VPID_EXTENT_ALL_CONTEXT, 0, 0);
    }

    -static inline void vpid_sync_context(struct vcpu_vmx *vmx)
    +static inline void vpid_sync_context(int vpid)
    {
    if (cpu_has_vmx_invvpid_single())
    - vpid_sync_vcpu_single(vmx);
    + vpid_sync_vcpu_single(vpid);
    else
    vpid_sync_vcpu_global();
    }
    @@ -3441,9 +3441,9 @@ static void exit_lmode(struct kvm_vcpu *vcpu)

    #endif

    -static void vmx_flush_tlb(struct kvm_vcpu *vcpu)
    +static inline void __vmx_flush_tlb(struct kvm_vcpu *vcpu, int vpid)
    {
    - vpid_sync_context(to_vmx(vcpu));
    + vpid_sync_context(vpid);
    if (enable_ept) {
    if (!VALID_PAGE(vcpu->arch.mmu.root_hpa))
    return;
    @@ -3451,6 +3451,11 @@ static void vmx_flush_tlb(struct kvm_vcpu *vcpu)
    }
    }

    +static void vmx_flush_tlb(struct kvm_vcpu *vcpu)
    +{
    + __vmx_flush_tlb(vcpu, to_vmx(vcpu)->vpid);
    +}
    +
    static void vmx_decache_cr0_guest_bits(struct kvm_vcpu *vcpu)
    {
    ulong cr0_guest_owned_bits = vcpu->arch.cr0_guest_owned_bits;
    @@ -4784,7 +4789,7 @@ static void vmx_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)
    vmx_fpu_activate(vcpu);
    update_exception_bitmap(vcpu);

    - vpid_sync_context(vmx);
    + vpid_sync_context(vmx->vpid);
    }

    /*
    --
    1.8.3.1



    \
     
     \ /
      Last update: 2015-09-28 13:01    [W:3.236 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site