KVM: PPC: E500: Fix clear_tlb_refs
Subsystems (2)
PATCH 12/56 KVM: PPC: E500: Fix clear_tlb_refs
Our mapping code assumes that TLB0 entries are always mapped. However, after calling clear_tlb_refs() this is no longer the case.
Map them dynamically if we find an entry unmapped in TLB0.
Signed-off-by Alexander Graf <[email protected]>
--- arch/powerpc/kvm/e500_tlb.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
arch/powerpc/kvm/e500_tlb.c +6 -2
@@ -1039,8 +1039,12 @@ void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 eaddr, gpa_t gpaddr, sesel =0 ;/* unused */ priv = &vcpu_e500->gtlb_priv[tlbsel][esel]; -kvmppc_e500_setup_stlbe (vcpu, gtlbe,BOOK3E_PAGESZ_4K , - &priv->ref, eaddr, &stlbe); +/* Only triggers after clear_tlb_refs */ +if (unlikely (!(priv->ref.flags &E500_TLB_VALID ))) +kvmppc_e500_tlb0_map (vcpu_e500, esel, &stlbe); +else +kvmppc_e500_setup_stlbe (vcpu, gtlbe,BOOK3E_PAGESZ_4K , + &priv->ref, eaddr, &stlbe);break ;case 1 : {
Signature · 1 line
1.6.0.2