| Message ID | 1463647483-12148-1-git-send-email-thuth@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
On 05/19/2016 10:44 AM, Thomas Huth wrote: > 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: Thomas Huth <thuth@redhat.com> Looks good, but please add a comment that H_EMUL_ASSIST doesn't provide the flags inside the code ;) Alex > --- > arch/powerpc/kvm/book3s_pr.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c > index 95bceca..b12e80a 100644 > --- a/arch/powerpc/kvm/book3s_pr.c > +++ b/arch/powerpc/kvm/book3s_pr.c > @@ -1031,7 +1031,10 @@ int kvmppc_handle_exit_pr(struct kvm_run *run, struct kvm_vcpu *vcpu, > int emul; > > program_interrupt: > - flags = vcpu->arch.shadow_srr1 & 0x1f0000ull; > + 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) { -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c index 95bceca..b12e80a 100644 --- a/arch/powerpc/kvm/book3s_pr.c +++ b/arch/powerpc/kvm/book3s_pr.c @@ -1031,7 +1031,10 @@ int kvmppc_handle_exit_pr(struct kvm_run *run, struct kvm_vcpu *vcpu, int emul; program_interrupt: - flags = vcpu->arch.shadow_srr1 & 0x1f0000ull; + 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) {
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: Thomas Huth <thuth@redhat.com> --- arch/powerpc/kvm/book3s_pr.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)