From: Julien Thierry <julien.thierry@arm.com>
To: "Marc Zyngier" <marc.zyngier@arm.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org
Cc: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v1 1/2] KVM: arm64: handle single-stepping trapped instructions
Date: Fri, 6 Oct 2017 13:34:36 +0100 [thread overview]
Message-ID: <49ddad48-d3ce-43e2-7aae-f6cc66ef1fad@arm.com> (raw)
In-Reply-To: <d95a7ce1-1996-b0c6-4a2d-64af011c0c79@arm.com>
On 06/10/17 13:27, Marc Zyngier wrote:
> On 06/10/17 12:39, Alex Bennée wrote:
>> If we are using guest debug to single-step the guest we need to ensure
>> we exit after emulating the instruction. This only affects
>> instructions completely emulated by the kernel. For userspace emulated
>> instructions we need to exit and return to complete the emulation.
>>
>> We fake debug.arch.hsr to contain ESR_ELx_EC_SOFTSTP_LOW so QEMU knows
>> it was a single-step event (and without altering the userspace ABI).
>>
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> ---
>> arch/arm64/kvm/handle_exit.c | 48 +++++++++++++++++++++++++++++++-------------
>> 1 file changed, 34 insertions(+), 14 deletions(-)
>>
>> diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c
>> index 7debb74843a0..c918d291cb58 100644
>> --- a/arch/arm64/kvm/handle_exit.c
>> +++ b/arch/arm64/kvm/handle_exit.c
>> @@ -178,6 +178,39 @@ static exit_handle_fn kvm_get_exit_handler(struct kvm_vcpu *vcpu)
>> return arm_exit_handlers[hsr_ec];
>> }
>>
>> +/*
>> + * When handling traps we need to ensure exit the guest if we
>> + * completely emulated the instruction while single-stepping. Stuff to
>> + * be emulated in userspace needs to complete that first.
>> + */
>> +
>> +static int handle_trap_exceptions(struct kvm_vcpu *vcpu, struct kvm_run *run)
>> +{
>> + int handled;
>> +
>> + /*
>> + * See ARM ARM B1.14.1: "Hyp traps on instructions
>> + * that fail their condition code check"
>> + */
>> + if (!kvm_condition_valid(vcpu)) {
>> + kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu));
>> + handled = 1;
>> + } else {
>> + exit_handle_fn exit_handler;
>> +
>> + exit_handler = kvm_get_exit_handler(vcpu);
>> + handled = exit_handler(vcpu, run);
>> + }
>> +
>> + if (handled && (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP)) {
>> + handled = 0;
>> + run->exit_reason = KVM_EXIT_DEBUG;
>> + run->debug.arch.hsr = ESR_ELx_EC_SOFTSTP_LOW << ESR_ELx_EC_SHIFT;
>> + }
>
> Doesn't this break an MMIO read? The registers haven't been updated yet,
> and the debugger may not see the right thing...
>
> How about something like:
>
> if (handled && (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP)) {
> if (run->exit_reason == KVM_EXIT_MMIO)
> kvm_handle_mmio_return(vcpu, run);
> [...]
> }
>
> Or am I missing something?
If the MMIO was not handled by the kernel, exit_handler will return 0,
so handled will be false and we won't pretend we have a debug exception
(but will still return to userland with KVM_EXIT_MMIO).
I think the second patch takes care of properly handling single step for
userland MMIO.
--
Julien Thierry
next prev parent reply other threads:[~2017-10-06 12:34 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20171006113921.24880-1-alex.bennee@linaro.org>
2017-10-06 11:39 ` Alex Bennée
2017-10-06 12:27 ` Marc Zyngier
2017-10-06 12:34 ` Julien Thierry [this message]
2017-10-06 12:46 ` Marc Zyngier
2017-10-06 13:15 ` Julien Thierry
2017-10-13 8:26 ` Christoffer Dall
2017-10-13 9:15 ` Alex Bennée
2017-10-14 14:16 ` Christoffer Dall
2017-10-06 11:39 ` [PATCH v1 2/2] kvm: arm64: handle single-step of userspace mmio instructions Alex Bennée
2017-10-06 12:37 ` Marc Zyngier
2017-10-06 12:44 ` Marc Zyngier
2017-10-06 13:47 ` Alex Bennée
2017-10-06 14:00 ` Marc Zyngier
2017-10-06 14:26 ` Julien Thierry
2017-10-06 14:43 ` Marc Zyngier
2017-10-06 13:13 ` Julien Thierry
2017-10-06 13:45 ` Alex Bennée
2017-10-06 14:27 ` Julien Thierry
2017-10-13 8:59 ` Christoffer Dall
2017-10-13 9:23 ` Alex Bennée
2017-10-14 14:18 ` Christoffer Dall
2017-10-13 8:56 ` Christoffer Dall
2017-10-13 9:27 ` Alex Bennée
2017-10-14 14:20 ` Christoffer Dall
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=49ddad48-d3ce-43e2-7aae-f6cc66ef1fad@arm.com \
--to=julien.thierry@arm.com \
--cc=alex.bennee@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=christoffer.dall@linaro.org \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=will.deacon@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®