Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758586AbcCVKLd (ORCPT ); Tue, 22 Mar 2016 06:11:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51612 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758542AbcCVKLY (ORCPT ); Tue, 22 Mar 2016 06:11:24 -0400 Subject: Re: [PATCH] kvm-pr: manage illegal instructions To: kvm-ppc@vger.kernel.org, kvm@vger.kernel.org References: <1458073117-24652-1-git-send-email-lvivier@redhat.com> Cc: Gleb Natapov , Paolo Bonzini , Alexander Graf , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org From: Laurent Vivier Message-ID: <56F11A46.5010905@redhat.com> Date: Tue, 22 Mar 2016 11:11:18 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <1458073117-24652-1-git-send-email-lvivier@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2063 Lines: 62 Hi, as Paolo has merged the test into kvm-unit-tests, this patch (and original bug) can be now tested with it. git://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git at least: be9b007 powerpc: add test to check invalid instruction trap Run this with KVM-PR and check your dmesg: qemu-system-ppc64 -machine pseries,accel=kvm \ -bios powerpc/boot_rom.bin \ -display none -serial stdio \ -kernel powerpc/emulator.elf -smp 1 Laurent On 15/03/2016 21:18, Laurent Vivier wrote: > While writing some instruction tests for kvm-unit-tests for powerpc, > I've found that illegal instructions are not managed correctly with kvm-pr, > while it is fine with kvm-hv. > > When an illegal instruction (like ".long 0") is processed by kvm-pr, > the kernel logs are filled with: > > Couldn't emulate instruction 0x00000000 (op 0 xop 0) > kvmppc_handle_exit_pr: emulation at 700 failed (00000000) > > While the exception handler receives an interrupt for each instruction > executed after the illegal instruction. > > Signed-off-by: Laurent Vivier > --- > arch/powerpc/kvm/book3s_emulate.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/arch/powerpc/kvm/book3s_emulate.c b/arch/powerpc/kvm/book3s_emulate.c > index 2afdb9c..4ee969d 100644 > --- a/arch/powerpc/kvm/book3s_emulate.c > +++ b/arch/powerpc/kvm/book3s_emulate.c > @@ -99,7 +99,6 @@ int kvmppc_core_emulate_op_pr(struct kvm_run *run, struct kvm_vcpu *vcpu, > > switch (get_op(inst)) { > case 0: > - emulated = EMULATE_FAIL; > if ((kvmppc_get_msr(vcpu) & MSR_LE) && > (inst == swab32(inst_sc))) { > /* > @@ -112,6 +111,9 @@ int kvmppc_core_emulate_op_pr(struct kvm_run *run, struct kvm_vcpu *vcpu, > kvmppc_set_gpr(vcpu, 3, EV_UNIMPLEMENTED); > kvmppc_set_pc(vcpu, kvmppc_get_pc(vcpu) + 4); > emulated = EMULATE_DONE; > + } else { > + kvmppc_core_queue_program(vcpu, SRR1_PROGILL); > + emulated = EMULATE_AGAIN; > } > break; > case 19: >