Commit e1e575f6 authored by James Hogan's avatar James Hogan Committed by Paolo Bonzini
Browse files

KVM: MIPS: Precalculate MMIO load resume PC 



The advancing of the PC when completing an MMIO load is done before
re-entering the guest, i.e. before restoring the guest ASID. However if
the load is in a branch delay slot it may need to access guest code to
read the prior branch instruction. This isn't safe in TLB mapped code at
the moment, nor in the future when we'll access unmapped guest segments
using direct user accessors too, as it could read the branch from host
user memory instead.

Therefore calculate the resume PC in advance while we're still in the
right context and save it in the new vcpu->arch.io_pc (replacing the no
longer needed vcpu->arch.pending_load_cause), and restore it on MMIO
completion.

Fixes: e685c689 ("KVM/MIPS32: Privileged instruction/target branch emulation.")
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
Cc: <stable@vger.kernel.org> # 3.10.x-
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent ede5f3e7

arch/mips/include/asm/kvm_host.h

+4 −3
Original line number Diff line number Diff line
@@ -293,7 +293,10 @@ struct kvm_vcpu_arch { 
	/* Host KSEG0 address of the EI/DI offset */

	void *kseg0_commpage;



	u32 io_gpr;		/* GPR used as IO source/target */

	/* Resume PC after MMIO completion */

	unsigned long io_pc;

	/* GPR used as IO source/target */

	u32 io_gpr;



	struct hrtimer comparecount_timer;

	/* Count timer control KVM register */
@@ -315,8 +318,6 @@ struct kvm_vcpu_arch { 
	/* Bitmask of pending exceptions to be cleared */

	unsigned long pending_exceptions_clr;



	u32 pending_load_cause;



	/* Save/Restore the entryhi register when are are preempted/scheduled back in */

	unsigned long preempt_entryhi;

arch/mips/kvm/emulate.c

+15 −9
Original line number Diff line number Diff line
@@ -1528,13 +1528,25 @@ enum emulation_result kvm_mips_emulate_load(union mips_instruction inst, 
					    struct kvm_vcpu *vcpu)

{

	enum emulation_result er = EMULATE_DO_MMIO;

	unsigned long curr_pc;

	u32 op, rt;

	u32 bytes;



	rt = inst.i_format.rt;

	op = inst.i_format.opcode;



	vcpu->arch.pending_load_cause = cause;

	/*

	 * Find the resume PC now while we have safe and easy access to the

	 * prior branch instruction, and save it for

	 * kvm_mips_complete_mmio_load() to restore later.

	 */

	curr_pc = vcpu->arch.pc;

	er = update_pc(vcpu, cause);

	if (er == EMULATE_FAIL)

		return er;

	vcpu->arch.io_pc = vcpu->arch.pc;

	vcpu->arch.pc = curr_pc;



	vcpu->arch.io_gpr = rt;



	switch (op) {
@@ -2494,9 +2506,8 @@ enum emulation_result kvm_mips_complete_mmio_load(struct kvm_vcpu *vcpu, 
		goto done;

	}



	er = update_pc(vcpu, vcpu->arch.pending_load_cause);

	if (er == EMULATE_FAIL)

		return er;

	/* Restore saved resume PC */

	vcpu->arch.pc = vcpu->arch.io_pc;



	switch (run->mmio.len) {

	case 4:
@@ -2518,11 +2529,6 @@ enum emulation_result kvm_mips_complete_mmio_load(struct kvm_vcpu *vcpu, 
		break;

	}



	if (vcpu->arch.pending_load_cause & CAUSEF_BD)

		kvm_debug("[%#lx] Completing %d byte BD Load to gpr %d (0x%08lx) type %d\n",

			  vcpu->arch.pc, run->mmio.len, vcpu->arch.io_gpr, *gpr,

			  vcpu->mmio_needed);



done:

	return er;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE