Commit a1ecc54d authored by James Hogan's avatar James Hogan
Browse files

KVM: MIPS/T&E: Don't treat code fetch faults as MMIO 



In order to make use of the CP0_BadInstr & CP0_BadInstrP registers we
need to be a bit more careful not to treat code fetch faults as MMIO,
lest we hit an UNPREDICTABLE register value when we try to emulate the
MMIO load instruction but there was no valid instruction word available
to the hardware.

Add a kvm_is_ifetch_fault() helper to try to figure out whether a load
fault was due to a code fetch, and prevent MMIO instruction emulation in
that case.

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 a98dd741

arch/mips/include/asm/kvm_host.h

+27 −0
Original line number Diff line number Diff line
@@ -643,6 +643,33 @@ void kvm_trap_emul_invalidate_gva(struct kvm_vcpu *vcpu, unsigned long addr, 
u32 kvm_get_inst(u32 *opc, struct kvm_vcpu *vcpu);

enum emulation_result update_pc(struct kvm_vcpu *vcpu, u32 cause);



/**

 * kvm_is_ifetch_fault() - Find whether a TLBL exception is due to ifetch fault.

 * @vcpu:	Virtual CPU.

 *

 * Returns:	Whether the TLBL exception was likely due to an instruction

 *		fetch fault rather than a data load fault.

 */

static inline bool kvm_is_ifetch_fault(struct kvm_vcpu_arch *vcpu)

{

	unsigned long badvaddr = vcpu->host_cp0_badvaddr;

	unsigned long epc = msk_isa16_mode(vcpu->pc);

	u32 cause = vcpu->host_cp0_cause;



	if (epc == badvaddr)

		return true;



	/*

	 * Branches may be 32-bit or 16-bit instructions.

	 * This isn't exact, but we don't really support MIPS16 or microMIPS yet

	 * in KVM anyway.

	 */

	if ((cause & CAUSEF_BD) && badvaddr - epc <= 4)

		return true;



	return false;

}



extern enum emulation_result kvm_mips_emulate_inst(u32 cause,

						   u32 *opc,

						   struct kvm_run *run,

arch/mips/kvm/trap_emul.c

+12 −0
Original line number Diff line number Diff line
@@ -178,6 +178,12 @@ static int kvm_trap_emul_handle_tlb_miss(struct kvm_vcpu *vcpu, bool store) 
		}

	} else if (KVM_GUEST_KERNEL_MODE(vcpu)

		   && (KSEGX(badvaddr) == CKSEG0 || KSEGX(badvaddr) == CKSEG1)) {

		/* A code fetch fault doesn't count as an MMIO */

		if (!store && kvm_is_ifetch_fault(&vcpu->arch)) {

			run->exit_reason = KVM_EXIT_INTERNAL_ERROR;

			return RESUME_HOST;

		}



		/*

		 * With EVA we may get a TLB exception instead of an address

		 * error when the guest performs MMIO to KSeg1 addresses.
@@ -255,6 +261,12 @@ static int kvm_trap_emul_handle_addr_err_ld(struct kvm_vcpu *vcpu) 
	int ret = RESUME_GUEST;



	if (KSEGX(badvaddr) == CKSEG0 || KSEGX(badvaddr) == CKSEG1) {

		/* A code fetch fault doesn't count as an MMIO */

		if (kvm_is_ifetch_fault(&vcpu->arch)) {

			run->exit_reason = KVM_EXIT_INTERNAL_ERROR;

			return RESUME_HOST;

		}



		kvm_debug("Emulate Load from MMIO space @ %#lx\n", badvaddr);

		er = kvm_mips_emulate_inst(cause, opc, run, vcpu);

		if (er == EMULATE_FAIL) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE