Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36ada4f4 authored by Scott Wood's avatar Scott Wood Committed by Alexander Graf
Browse files

kvm/ppc/e500: g2h_tlb1_map: clear old bit before setting new bit 



It's possible that we're using the same host TLB1 slot to map (a
presumably different portion of) the same guest TLB1 entry.  Clear
the bit in the map before setting it, so that if the esels are the same
the bit will remain set.

Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent d6940b64

arch/powerpc/kvm/e500_mmu_host.c

+4 −3
Original line number Diff line number Diff line
@@ -507,13 +507,14 @@ static int kvmppc_e500_tlb1_map_tlb1(struct kvmppc_vcpu_e500 *vcpu_e500, 
	if (unlikely(vcpu_e500->host_tlb1_nv >= tlb1_max_shadow_size()))

		vcpu_e500->host_tlb1_nv = 0;



	vcpu_e500->tlb_refs[1][sesel] = *ref;

	vcpu_e500->g2h_tlb1_map[esel] |= (u64)1 << sesel;

	vcpu_e500->gtlb_priv[1][esel].ref.flags |= E500_TLB_BITMAP;

	if (vcpu_e500->h2g_tlb1_rmap[sesel]) {

		unsigned int idx = vcpu_e500->h2g_tlb1_rmap[sesel] - 1;

		vcpu_e500->g2h_tlb1_map[idx] &= ~(1ULL << sesel);

	}



	vcpu_e500->tlb_refs[1][sesel] = *ref;

	vcpu_e500->gtlb_priv[1][esel].ref.flags |= E500_TLB_BITMAP;

	vcpu_e500->g2h_tlb1_map[esel] |= (u64)1 << sesel;

	vcpu_e500->h2g_tlb1_rmap[sesel] = esel + 1;



	return sesel;