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

Commit b69890d1 authored by Thomas Huth's avatar Thomas Huth Committed by Paul Mackerras
Browse files

KVM: PPC: Book3S PR: Fix contents of SRR1 when injecting a program exception 



vcpu->arch.shadow_srr1 only contains usable values for injecting
a program exception into the guest if we entered the function
kvmppc_handle_exit_pr() with exit_nr == BOOK3S_INTERRUPT_PROGRAM.
In other cases, the shadow_srr1 bits are zero. Since we want to
pass an illegal-instruction program check to the guest, set
"flags" to SRR1_PROGILL for these other cases.

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent 708e75a3

arch/powerpc/kvm/book3s_pr.c

+11 −1
Original line number Diff line number Diff line
@@ -1049,7 +1049,17 @@ int kvmppc_handle_exit_pr(struct kvm_run *run, struct kvm_vcpu *vcpu, 
		int emul;



program_interrupt:

		/*

		 * shadow_srr1 only contains valid flags if we came here via

		 * a program exception. The other exceptions (emulation assist,

		 * FP unavailable, etc.) do not provide flags in SRR1, so use

		 * an illegal-instruction exception when injecting a program

		 * interrupt into the guest.

		 */

		if (exit_nr == BOOK3S_INTERRUPT_PROGRAM)

			flags = vcpu->arch.shadow_srr1 & 0x1f0000ull;

		else

			flags = SRR1_PROGILL;



		emul = kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst);

		if (emul != EMULATE_DONE) {