lkml.org 
[lkml]   [2020]   [Feb]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH RFC 3/4] KVM: MIPS: Replace all the kvm_flush_remote_tlbs() references
    Date
    Replace kvm_flush_remote_tlbs() calls in MIPS code into
    kvm_flush_remote_tlbs_common(). This is to prepare that MIPS will
    define its own kvm_flush_remote_tlbs() soon.

    The only three references are all in the flush_shadow_all() hooks.
    One of them can be directly dropped because it's exactly the
    kvm_flush_remote_tlbs_common(). Since at it, refactors the other one
    a bit.

    No functional change expected.

    Signed-off-by: Peter Xu <peterx@redhat.com>
    ---
    arch/mips/kvm/trap_emul.c | 8 +-------
    arch/mips/kvm/vz.c | 7 ++-----
    2 files changed, 3 insertions(+), 12 deletions(-)

    diff --git a/arch/mips/kvm/trap_emul.c b/arch/mips/kvm/trap_emul.c
    index 2ecb430ea0f1..ced481c963be 100644
    --- a/arch/mips/kvm/trap_emul.c
    +++ b/arch/mips/kvm/trap_emul.c
    @@ -697,12 +697,6 @@ static int kvm_trap_emul_vcpu_setup(struct kvm_vcpu *vcpu)
    return 0;
    }

    -static void kvm_trap_emul_flush_shadow_all(struct kvm *kvm)
    -{
    - /* Flush GVA page tables and invalidate GVA ASIDs on all VCPUs */
    - kvm_flush_remote_tlbs(kvm);
    -}
    -
    static u64 kvm_trap_emul_get_one_regs[] = {
    KVM_REG_MIPS_CP0_INDEX,
    KVM_REG_MIPS_CP0_ENTRYLO0,
    @@ -1285,7 +1279,7 @@ static struct kvm_mips_callbacks kvm_trap_emul_callbacks = {
    .vcpu_init = kvm_trap_emul_vcpu_init,
    .vcpu_uninit = kvm_trap_emul_vcpu_uninit,
    .vcpu_setup = kvm_trap_emul_vcpu_setup,
    - .flush_shadow_all = kvm_trap_emul_flush_shadow_all,
    + .flush_shadow_all = kvm_flush_remote_tlbs_common,
    .gva_to_gpa = kvm_trap_emul_gva_to_gpa_cb,
    .queue_timer_int = kvm_mips_queue_timer_int_cb,
    .dequeue_timer_int = kvm_mips_dequeue_timer_int_cb,
    diff --git a/arch/mips/kvm/vz.c b/arch/mips/kvm/vz.c
    index 814bd1564a79..91fbf6710da4 100644
    --- a/arch/mips/kvm/vz.c
    +++ b/arch/mips/kvm/vz.c
    @@ -3105,10 +3105,7 @@ static int kvm_vz_vcpu_setup(struct kvm_vcpu *vcpu)

    static void kvm_vz_flush_shadow_all(struct kvm *kvm)
    {
    - if (cpu_has_guestid) {
    - /* Flush GuestID for each VCPU individually */
    - kvm_flush_remote_tlbs(kvm);
    - } else {
    + if (!cpu_has_guestid) {
    /*
    * For each CPU there is a single GPA ASID used by all VCPUs in
    * the VM, so it doesn't make sense for the VCPUs to handle
    @@ -3119,8 +3116,8 @@ static void kvm_vz_flush_shadow_all(struct kvm *kvm)
    * kick any running VCPUs so they check asid_flush_mask.
    */
    cpumask_setall(&kvm->arch.asid_flush_mask);
    - kvm_flush_remote_tlbs(kvm);
    }
    + kvm_flush_remote_tlbs_common(kvm);
    }

    static void kvm_vz_vcpu_reenter(struct kvm_run *run, struct kvm_vcpu *vcpu)
    --
    2.24.1
    \
     
     \ /
      Last update: 2020-02-07 23:36    [W:2.112 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site