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

Commit 249ba1ee authored by Alexander Graf's avatar Alexander Graf
Browse files

KVM: PPC: Add cache flush on page map 



When we map a page that wasn't icache cleared before, do so when first
mapping it in KVM using the same information bits as the Linux mapping
logic. That way we are 100% sure that any page we map does not have stale
entries in the icache.

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 04f995a5

arch/powerpc/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <asm/kvm_asm.h>

#include <asm/processor.h>

#include <asm/page.h>

#include <asm/cacheflush.h>



#define KVM_MAX_VCPUS		NR_CPUS

#define KVM_MAX_VCORES		NR_CPUS

arch/powerpc/include/asm/kvm_ppc.h

+12 −0
Original line number Diff line number Diff line
@@ -219,4 +219,16 @@ void kvmppc_claim_lpid(long lpid); 
void kvmppc_free_lpid(long lpid);

void kvmppc_init_lpid(unsigned long nr_lpids);



static inline void kvmppc_mmu_flush_icache(pfn_t pfn)

{

	/* Clear i-cache for new pages */

	struct page *page;

	page = pfn_to_page(pfn);

	if (!test_bit(PG_arch_1, &page->flags)) {

		flush_dcache_icache_page(page);

		set_bit(PG_arch_1, &page->flags);

	}

}





#endif /* __POWERPC_KVM_PPC_H__ */

arch/powerpc/kvm/book3s_32_mmu_host.c

+3 −0
Original line number Diff line number Diff line
@@ -211,6 +211,9 @@ int kvmppc_mmu_map_page(struct kvm_vcpu *vcpu, struct kvmppc_pte *orig_pte) 
		pteg1 |= PP_RWRX;

	}



	if (orig_pte->may_execute)

		kvmppc_mmu_flush_icache(hpaddr >> PAGE_SHIFT);



	local_irq_disable();



	if (pteg[rr]) {

arch/powerpc/kvm/book3s_64_mmu_host.c

+2 −0
Original line number Diff line number Diff line
@@ -126,6 +126,8 @@ int kvmppc_mmu_map_page(struct kvm_vcpu *vcpu, struct kvmppc_pte *orig_pte) 


	if (!orig_pte->may_execute)

		rflags |= HPTE_R_N;

	else

		kvmppc_mmu_flush_icache(hpaddr >> PAGE_SHIFT);



	hash = hpt_hash(va, PTE_SIZE, MMU_SEGSIZE_256M);

arch/powerpc/kvm/e500_tlb.c

+3 −0
Original line number Diff line number Diff line
@@ -539,6 +539,9 @@ static inline void kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, 


	kvmppc_e500_setup_stlbe(&vcpu_e500->vcpu, gtlbe, tsize,

				ref, gvaddr, stlbe);



	/* Clear i-cache for new pages */

	kvmppc_mmu_flush_icache(pfn);

}



/* XXX only map the one-one case, for now use TLB0 */