Commit 8af0e3c2 authored by James Hogan's avatar James Hogan
Browse files

KVM: MIPS/Emulate: Fix CACHE emulation for EVA hosts 



Use protected_writeback_dcache_line() instead of flush_dcache_line(),
and protected_flush_icache_line() instead of flush_icache_line(), so
that CACHEE (the EVA variant) is used on EVA host kernels.

Without this, guest floating point branch delay slot emulation via a
trampoline on the user stack fails on EVA host kernels due to failure of
the icache sync, resulting in the break instruction getting skipped and
execution from the stack.

Signed-off-by: default avatarJames 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
parent dacc3ed1

arch/mips/kvm/emulate.c

+3 −3
Original line number Diff line number Diff line
@@ -1792,7 +1792,7 @@ enum emulation_result kvm_mips_emulate_cache(union mips_instruction inst, 
skip_fault:

	/* XXXKYMA: Only a subset of cache ops are supported, used by Linux */

	if (op_inst == Hit_Writeback_Inv_D || op_inst == Hit_Invalidate_D) {

		flush_dcache_line(va);

		protected_writeback_dcache_line(va);



#ifdef CONFIG_KVM_MIPS_DYN_TRANS

		/*
@@ -1802,8 +1802,8 @@ enum emulation_result kvm_mips_emulate_cache(union mips_instruction inst, 
		kvm_mips_trans_cache_va(inst, opc, vcpu);

#endif

	} else if (op_inst == Hit_Invalidate_I) {

		flush_dcache_line(va);

		flush_icache_line(va);

		protected_writeback_dcache_line(va);

		protected_flush_icache_line(va);



#ifdef CONFIG_KVM_MIPS_DYN_TRANS

		/* Replace the CACHE instruction, with a SYNCI */