From: Nicholas Piggin <npiggin@gmail.com> To: Fabiano Rosas <farosas@linux.ibm.com>, kvm-ppc@vger.kernel.org Cc: aik@ozlabs.ru, linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH v3 4/6] KVM: PPC: mmio: Queue interrupt at kvmppc_emulate_mmio Date: Mon, 10 Jan 2022 15:29:44 +1000 [thread overview] Message-ID: <1641792561.xpvi87mg71.astroid@bobo.none> (raw) In-Reply-To: <20220107210012.4091153-5-farosas@linux.ibm.com> Excerpts from Fabiano Rosas's message of January 8, 2022 7:00 am: > If MMIO emulation fails, we queue a Program interrupt to the > guest. Move that line up into kvmppc_emulate_mmio, which is where we > set RESUME_GUEST/HOST. This allows the removal of the 'advance' > variable. > > No functional change, just separation of responsibilities. Looks cleaner. Reviewed-by: Nicholas Piggin <npiggin@gmail.com> > > Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com> > --- > arch/powerpc/kvm/emulate_loadstore.c | 8 +------- > arch/powerpc/kvm/powerpc.c | 2 +- > 2 files changed, 2 insertions(+), 8 deletions(-) > > diff --git a/arch/powerpc/kvm/emulate_loadstore.c b/arch/powerpc/kvm/emulate_loadstore.c > index 48272a9b9c30..4dec920fe4c9 100644 > --- a/arch/powerpc/kvm/emulate_loadstore.c > +++ b/arch/powerpc/kvm/emulate_loadstore.c > @@ -73,7 +73,6 @@ int kvmppc_emulate_loadstore(struct kvm_vcpu *vcpu) > { > u32 inst; > enum emulation_result emulated = EMULATE_FAIL; > - int advance = 1; > struct instruction_op op; > > /* this default type might be overwritten by subcategories */ > @@ -355,15 +354,10 @@ int kvmppc_emulate_loadstore(struct kvm_vcpu *vcpu) > } > } > > - if (emulated == EMULATE_FAIL) { > - advance = 0; > - kvmppc_core_queue_program(vcpu, 0); > - } > - > trace_kvm_ppc_instr(inst, kvmppc_get_pc(vcpu), emulated); > > /* Advance past emulated instruction. */ > - if (advance) > + if (emulated != EMULATE_FAIL) > kvmppc_set_pc(vcpu, kvmppc_get_pc(vcpu) + 4); > > return emulated; > diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c > index 4d7d0d080232..6daeea4a7de1 100644 > --- a/arch/powerpc/kvm/powerpc.c > +++ b/arch/powerpc/kvm/powerpc.c > @@ -307,7 +307,7 @@ int kvmppc_emulate_mmio(struct kvm_vcpu *vcpu) > u32 last_inst; > > kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst); > - /* XXX Deliver Program interrupt to guest. */ > + kvmppc_core_queue_program(vcpu, 0); > pr_info("%s: emulation failed (%08x)\n", __func__, last_inst); > r = RESUME_HOST; > break; > -- > 2.33.1 > >
WARNING: multiple messages have this Message-ID (diff)
From: Nicholas Piggin <npiggin@gmail.com> To: Fabiano Rosas <farosas@linux.ibm.com>, kvm-ppc@vger.kernel.org Cc: aik@ozlabs.ru, linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH v3 4/6] KVM: PPC: mmio: Queue interrupt at kvmppc_emulate_mmio Date: Mon, 10 Jan 2022 05:29:44 +0000 [thread overview] Message-ID: <1641792561.xpvi87mg71.astroid@bobo.none> (raw) In-Reply-To: <20220107210012.4091153-5-farosas@linux.ibm.com> Excerpts from Fabiano Rosas's message of January 8, 2022 7:00 am: > If MMIO emulation fails, we queue a Program interrupt to the > guest. Move that line up into kvmppc_emulate_mmio, which is where we > set RESUME_GUEST/HOST. This allows the removal of the 'advance' > variable. > > No functional change, just separation of responsibilities. Looks cleaner. Reviewed-by: Nicholas Piggin <npiggin@gmail.com> > > Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com> > --- > arch/powerpc/kvm/emulate_loadstore.c | 8 +------- > arch/powerpc/kvm/powerpc.c | 2 +- > 2 files changed, 2 insertions(+), 8 deletions(-) > > diff --git a/arch/powerpc/kvm/emulate_loadstore.c b/arch/powerpc/kvm/emulate_loadstore.c > index 48272a9b9c30..4dec920fe4c9 100644 > --- a/arch/powerpc/kvm/emulate_loadstore.c > +++ b/arch/powerpc/kvm/emulate_loadstore.c > @@ -73,7 +73,6 @@ int kvmppc_emulate_loadstore(struct kvm_vcpu *vcpu) > { > u32 inst; > enum emulation_result emulated = EMULATE_FAIL; > - int advance = 1; > struct instruction_op op; > > /* this default type might be overwritten by subcategories */ > @@ -355,15 +354,10 @@ int kvmppc_emulate_loadstore(struct kvm_vcpu *vcpu) > } > } > > - if (emulated == EMULATE_FAIL) { > - advance = 0; > - kvmppc_core_queue_program(vcpu, 0); > - } > - > trace_kvm_ppc_instr(inst, kvmppc_get_pc(vcpu), emulated); > > /* Advance past emulated instruction. */ > - if (advance) > + if (emulated != EMULATE_FAIL) > kvmppc_set_pc(vcpu, kvmppc_get_pc(vcpu) + 4); > > return emulated; > diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c > index 4d7d0d080232..6daeea4a7de1 100644 > --- a/arch/powerpc/kvm/powerpc.c > +++ b/arch/powerpc/kvm/powerpc.c > @@ -307,7 +307,7 @@ int kvmppc_emulate_mmio(struct kvm_vcpu *vcpu) > u32 last_inst; > > kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst); > - /* XXX Deliver Program interrupt to guest. */ > + kvmppc_core_queue_program(vcpu, 0); > pr_info("%s: emulation failed (%08x)\n", __func__, last_inst); > r = RESUME_HOST; > break; > -- > 2.33.1 > >
next prev parent reply other threads:[~2022-01-10 5:30 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-07 20:58 [PATCH v3 0/6] KVM: PPC: MMIO fixes Fabiano Rosas 2022-01-07 21:00 ` Fabiano Rosas 2022-01-07 20:58 ` [PATCH v3 2/6] KVM: PPC: Fix vmx/vsx mixup in mmio emulation Fabiano Rosas 2022-01-07 21:00 ` Fabiano Rosas 2022-01-07 20:58 ` [PATCH v3 1/6] KVM: PPC: Book3S HV: Stop returning internal values to userspace Fabiano Rosas 2022-01-07 21:00 ` Fabiano Rosas 2022-01-07 20:59 ` [PATCH v3 5/6] KVM: PPC: mmio: Return to guest after emulation failure Fabiano Rosas 2022-01-07 21:00 ` Fabiano Rosas 2022-01-10 7:36 ` Nicholas Piggin 2022-01-10 7:36 ` Nicholas Piggin 2022-01-10 23:51 ` Alexey Kardashevskiy 2022-01-10 23:51 ` Alexey Kardashevskiy 2022-01-11 3:23 ` Nicholas Piggin 2022-01-11 3:23 ` Nicholas Piggin 2022-01-11 14:39 ` Fabiano Rosas 2022-01-11 14:39 ` Fabiano Rosas 2022-01-07 20:59 ` [PATCH v3 6/6] KVM: PPC: mmio: Reject instructions that access more than mmio.data size Fabiano Rosas 2022-01-07 21:00 ` Fabiano Rosas 2022-01-10 7:38 ` Nicholas Piggin 2022-01-10 7:38 ` Nicholas Piggin 2022-01-11 14:32 ` Fabiano Rosas 2022-01-11 14:32 ` Fabiano Rosas 2022-01-07 20:59 ` [PATCH v3 4/6] KVM: PPC: mmio: Queue interrupt at kvmppc_emulate_mmio Fabiano Rosas 2022-01-07 21:00 ` Fabiano Rosas 2022-01-10 3:20 ` Alexey Kardashevskiy 2022-01-10 3:20 ` Alexey Kardashevskiy 2022-01-10 5:29 ` Nicholas Piggin [this message] 2022-01-10 5:29 ` Nicholas Piggin 2022-01-07 20:59 ` [PATCH v3 3/6] KVM: PPC: Don't use pr_emerg when mmio emulation fails Fabiano Rosas 2022-01-07 21:00 ` Fabiano Rosas 2022-01-10 5:22 ` Nicholas Piggin 2022-01-10 5:22 ` Nicholas Piggin 2022-01-11 14:39 ` Fabiano Rosas 2022-01-11 14:39 ` Fabiano Rosas
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1641792561.xpvi87mg71.astroid@bobo.none \ --to=npiggin@gmail.com \ --cc=aik@ozlabs.ru \ --cc=farosas@linux.ibm.com \ --cc=kvm-ppc@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.