KVM: MIPS/TLB: Generalise host TLB invalidate to kernel ASID

Refactor kvm_mips_host_tlb_inv() to also be able to invalidate any
matching TLB entry in the kernel ASID rather than assuming only the TLB
entries in the user ASID can change. Two new bool user/kernel arguments
allow the caller to indicate whether the mapping should affect each of
the ASIDs for guest user/kernel mode.

- kvm_mips_invalidate_guest_tlb() (used by TLBWI/TLBWR emulation) can
  now invalidate any corresponding TLB entry in both the kernel ASID
  (guest kernel may have accessed any guest mapping), and the user ASID
  if the entry being replaced is in guest USeg (where guest user may
  also have accessed it).

- The tlbmod fault handler (and the KSeg0 / TLB mapped / commpage fault
  handlers in later patches) can now invalidate the corresponding TLB
  entry in whichever ASID is currently active, since only a single page
  table will have been updated anyway.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Radim Krčmář" <rkrcmar@redhat.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: kvm@vger.kernel.org

diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_host.h
index 80928ffa0150a6ea6f16f042145008cea0042fce..fb2ea578c1937cc918431e24479fec3da6a19ac6 100644 (file)
--- a/arch/mips/include/asm/kvm_host.h
+++ b/arch/mips/include/asm/kvm_host.h
@@ -604,7 +604,8 @@ extern int kvm_mips_host_tlb_write(struct kvm_vcpu *vcpu, unsigned long entryhi,
                                   unsigned long entrylo1,
                                   int flush_dcache_mask);
 extern void kvm_mips_flush_host_tlb(int skip_kseg0);
-extern int kvm_mips_host_tlb_inv(struct kvm_vcpu *vcpu, unsigned long entryhi);
+extern int kvm_mips_host_tlb_inv(struct kvm_vcpu *vcpu, unsigned long entryhi,
+                                bool user, bool kernel);
 
 extern int kvm_mips_guest_tlb_lookup(struct kvm_vcpu *vcpu,
                                     unsigned long entryhi);

diff --git a/arch/mips/kvm/emulate.c b/arch/mips/kvm/emulate.c
index 060acc5b3378ef74e151296e3e5eb8222b78833c..611b8996ca0cec0a47150fbed8ab90c85181cafc 100644 (file)
--- a/arch/mips/kvm/emulate.c
+++ b/arch/mips/kvm/emulate.c
@@ -873,7 +873,7 @@ static void kvm_mips_invalidate_guest_tlb(struct kvm_vcpu *vcpu,
         * Probe the shadow host TLB for the entry being overwritten, if one
         * matches, invalidate it
         */
-       kvm_mips_host_tlb_inv(vcpu, tlb->tlb_hi);
+       kvm_mips_host_tlb_inv(vcpu, tlb->tlb_hi, user, true);
 
        /* Invalidate the whole ASID on other CPUs */
        cpu = smp_processor_id();
@@ -2100,13 +2100,15 @@ enum emulation_result kvm_mips_handle_tlbmod(u32 cause, u32 *opc,
        struct mips_coproc *cop0 = vcpu->arch.cop0;
        unsigned long entryhi = (vcpu->arch.host_cp0_badvaddr & VPN2_MASK) |
                        (kvm_read_c0_guest_entryhi(cop0) & KVM_ENTRYHI_ASID);
+       bool kernel = KVM_GUEST_KERNEL_MODE(vcpu);
        int index;
 
        /* If address not in the guest TLB, then we are in trouble */
        index = kvm_mips_guest_tlb_lookup(vcpu, entryhi);
        if (index < 0) {
                /* XXXKYMA Invalidate and retry */
-               kvm_mips_host_tlb_inv(vcpu, vcpu->arch.host_cp0_badvaddr);
+               kvm_mips_host_tlb_inv(vcpu, vcpu->arch.host_cp0_badvaddr,
+                                     !kernel, kernel);
                kvm_err("%s: host got TLBMOD for %#lx but entry not present in Guest TLB\n",
                     __func__, entryhi);
                kvm_mips_dump_guest_tlbs(vcpu);

diff --git a/arch/mips/kvm/tlb.c b/arch/mips/kvm/tlb.c
index 4bf82613d44053a305b52e0cf9b3a22696c269f0..06ee9a1d78a5f431cc424694e09d2f9b84c93958 100644 (file)
--- a/arch/mips/kvm/tlb.c
+++ b/arch/mips/kvm/tlb.c
@@ -263,16 +263,11 @@ int kvm_mips_host_tlb_lookup(struct kvm_vcpu *vcpu, unsigned long vaddr)
 }
 EXPORT_SYMBOL_GPL(kvm_mips_host_tlb_lookup);
 
-int kvm_mips_host_tlb_inv(struct kvm_vcpu *vcpu, unsigned long va)
+static int _kvm_mips_host_tlb_inv(unsigned long entryhi)
 {
        int idx;
-       unsigned long flags, old_entryhi;
-
-       local_irq_save(flags);
-
-       old_entryhi = read_c0_entryhi();
 
-       write_c0_entryhi((va & VPN2_MASK) | kvm_mips_get_user_asid(vcpu));
+       write_c0_entryhi(entryhi);
        mtc0_tlbw_hazard();
 
        tlb_probe();
@@ -292,14 +287,39 @@ int kvm_mips_host_tlb_inv(struct kvm_vcpu *vcpu, unsigned long va)
                tlbw_use_hazard();
        }
 
+       return idx;
+}
+
+int kvm_mips_host_tlb_inv(struct kvm_vcpu *vcpu, unsigned long va,
+                         bool user, bool kernel)
+{
+       int idx_user, idx_kernel;
+       unsigned long flags, old_entryhi;
+
+       local_irq_save(flags);
+
+       old_entryhi = read_c0_entryhi();
+
+       if (user)
+               idx_user = _kvm_mips_host_tlb_inv((va & VPN2_MASK) |
+                                                 kvm_mips_get_user_asid(vcpu));
+       if (kernel)
+               idx_kernel = _kvm_mips_host_tlb_inv((va & VPN2_MASK) |
+                                               kvm_mips_get_kernel_asid(vcpu));
+
        write_c0_entryhi(old_entryhi);
        mtc0_tlbw_hazard();
 
        local_irq_restore(flags);
 
-       if (idx >= 0)
-               kvm_debug("%s: Invalidated entryhi %#lx @ idx %d\n", __func__,
-                         (va & VPN2_MASK) | kvm_mips_get_user_asid(vcpu), idx);
+       if (user && idx_user >= 0)
+               kvm_debug("%s: Invalidated guest user entryhi %#lx @ idx %d\n",
+                         __func__, (va & VPN2_MASK) |
+                                   kvm_mips_get_user_asid(vcpu), idx_user);
+       if (kernel && idx_kernel >= 0)
+               kvm_debug("%s: Invalidated guest kernel entryhi %#lx @ idx %d\n",
+                         __func__, (va & VPN2_MASK) |
+                                   kvm_mips_get_kernel_asid(vcpu), idx_kernel);
 
        return 0;
 }