aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kvm/booke.c
diff options
context:
space:
mode:
authorMihai Caraman <mihai.caraman@freescale.com>2014-07-23 12:06:21 -0400
committerAlexander Graf <agraf@suse.de>2014-07-28 09:23:14 -0400
commit51f047261e717b74b226f837a16455994b61ae30 (patch)
treee94a57703fed176a72acef425cea442a8395746b /arch/powerpc/kvm/booke.c
parent9a26af64d6bba72c9dfd62cc0cab0e79f8a66d7b (diff)
KVM: PPC: Allow kvmppc_get_last_inst() to fail
On book3e, guest last instruction is read on the exit path using load external pid (lwepx) dedicated instruction. This load operation may fail due to TLB eviction and execute-but-not-read entries. This patch lay down the path for an alternative solution to read the guest last instruction, by allowing kvmppc_get_lat_inst() function to fail. Architecture specific implmentations of kvmppc_load_last_inst() may read last guest instruction and instruct the emulation layer to re-execute the guest in case of failure. Make kvmppc_get_last_inst() definition common between architectures. Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com> Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'arch/powerpc/kvm/booke.c')
-rw-r--r--arch/powerpc/kvm/booke.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
index a06ef6b30258..50df5e3072cc 100644
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -702,6 +702,9 @@ static int emulation_exit(struct kvm_run *run, struct kvm_vcpu *vcpu)
702 * they were actually modified by emulation. */ 702 * they were actually modified by emulation. */
703 return RESUME_GUEST_NV; 703 return RESUME_GUEST_NV;
704 704
705 case EMULATE_AGAIN:
706 return RESUME_GUEST;
707
705 case EMULATE_DO_DCR: 708 case EMULATE_DO_DCR:
706 run->exit_reason = KVM_EXIT_DCR; 709 run->exit_reason = KVM_EXIT_DCR;
707 return RESUME_HOST; 710 return RESUME_HOST;