From: Shannon Zhao <shannon.zhao@linaro.org> To: Marc Zyngier <marc.zyngier@arm.com>, Christoffer Dall <christoffer.dall@linaro.org> Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Subject: Re: [PATCH 1/2] arm: KVM: Do not update PC if the trap handler has updated it Date: Tue, 22 Dec 2015 18:35:18 +0800 [thread overview] Message-ID: <56792766.8040707@linaro.org> (raw) In-Reply-To: <1450778118-12715-2-git-send-email-marc.zyngier@arm.com> On 2015/12/22 17:55, Marc Zyngier wrote: > Assuming we trap a coprocessor access, and decide that the access > is illegal, we will inject an exception in the guest. In this > case, we shouldn't increment the PC, or the vcpu will miss the > first instruction of the handler, leading to a mildly confused > guest. > > Solve this by snapshoting PC before the access is performed, > and checking if it has moved or not before incrementing it. > > Reported-by: Shannon Zhao <shannon.zhao@linaro.org> > Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Reviewed-by: Shannon Zhao <shannon.zhao@linaro.org> > --- > arch/arm/kvm/coproc.c | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c > index f3d88dc..f4ad2f2 100644 > --- a/arch/arm/kvm/coproc.c > +++ b/arch/arm/kvm/coproc.c > @@ -447,12 +447,22 @@ static int emulate_cp15(struct kvm_vcpu *vcpu, > r = find_reg(params, cp15_regs, ARRAY_SIZE(cp15_regs)); > > if (likely(r)) { > + unsigned long pc = *vcpu_pc(vcpu); > + > /* If we don't have an accessor, we should never get here! */ > BUG_ON(!r->access); > > if (likely(r->access(vcpu, params, r))) { > - /* Skip instruction, since it was emulated */ > - kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu)); > + /* > + * Skip the instruction if it was emulated > + * without PC having changed. This allows us > + * to detect a fault being injected > + * (incrementing the PC here would cause the > + * vcpu to skip the first instruction of its > + * fault handler). > + */ > + if (pc == *vcpu_pc(vcpu)) > + kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu)); > return 1; > } > /* If access function fails, it should complain. */ > -- Shannon
WARNING: multiple messages have this Message-ID (diff)
From: shannon.zhao@linaro.org (Shannon Zhao) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/2] arm: KVM: Do not update PC if the trap handler has updated it Date: Tue, 22 Dec 2015 18:35:18 +0800 [thread overview] Message-ID: <56792766.8040707@linaro.org> (raw) In-Reply-To: <1450778118-12715-2-git-send-email-marc.zyngier@arm.com> On 2015/12/22 17:55, Marc Zyngier wrote: > Assuming we trap a coprocessor access, and decide that the access > is illegal, we will inject an exception in the guest. In this > case, we shouldn't increment the PC, or the vcpu will miss the > first instruction of the handler, leading to a mildly confused > guest. > > Solve this by snapshoting PC before the access is performed, > and checking if it has moved or not before incrementing it. > > Reported-by: Shannon Zhao <shannon.zhao@linaro.org> > Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Reviewed-by: Shannon Zhao <shannon.zhao@linaro.org> > --- > arch/arm/kvm/coproc.c | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c > index f3d88dc..f4ad2f2 100644 > --- a/arch/arm/kvm/coproc.c > +++ b/arch/arm/kvm/coproc.c > @@ -447,12 +447,22 @@ static int emulate_cp15(struct kvm_vcpu *vcpu, > r = find_reg(params, cp15_regs, ARRAY_SIZE(cp15_regs)); > > if (likely(r)) { > + unsigned long pc = *vcpu_pc(vcpu); > + > /* If we don't have an accessor, we should never get here! */ > BUG_ON(!r->access); > > if (likely(r->access(vcpu, params, r))) { > - /* Skip instruction, since it was emulated */ > - kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu)); > + /* > + * Skip the instruction if it was emulated > + * without PC having changed. This allows us > + * to detect a fault being injected > + * (incrementing the PC here would cause the > + * vcpu to skip the first instruction of its > + * fault handler). > + */ > + if (pc == *vcpu_pc(vcpu)) > + kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu)); > return 1; > } > /* If access function fails, it should complain. */ > -- Shannon
next prev parent reply other threads:[~2015-12-22 10:35 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-12-22 9:55 [PATCH 0/2] Fix PC corruption when injecting a fault Marc Zyngier 2015-12-22 9:55 ` Marc Zyngier 2015-12-22 9:55 ` [PATCH 1/2] arm: KVM: Do not update PC if the trap handler has updated it Marc Zyngier 2015-12-22 9:55 ` Marc Zyngier 2015-12-22 10:35 ` Shannon Zhao [this message] 2015-12-22 10:35 ` Shannon Zhao 2015-12-22 11:08 ` Peter Maydell 2015-12-22 11:08 ` Peter Maydell 2015-12-22 14:39 ` Christoffer Dall 2015-12-22 14:39 ` Christoffer Dall 2015-12-22 14:50 ` Peter Maydell 2015-12-22 14:50 ` Peter Maydell 2016-01-07 8:50 ` Marc Zyngier 2016-01-07 8:50 ` Marc Zyngier 2016-01-07 8:59 ` Shannon Zhao 2016-01-07 8:59 ` Shannon Zhao 2016-01-07 9:05 ` Marc Zyngier 2016-01-07 9:05 ` Marc Zyngier 2015-12-22 9:55 ` [PATCH 2/2] arm64: " Marc Zyngier 2015-12-22 9:55 ` Marc Zyngier 2015-12-22 10:15 ` Shannon Zhao 2015-12-22 10:15 ` Shannon Zhao
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=56792766.8040707@linaro.org \ --to=shannon.zhao@linaro.org \ --cc=christoffer.dall@linaro.org \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=marc.zyngier@arm.com \ /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.