From: Christoffer Dall <christoffer.dall@linaro.org> To: Paolo Bonzini <pbonzini@redhat.com> Cc: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org Subject: [PULL 8/8] arm64: kvm: report original PAR_EL1 upon panic Date: Tue, 24 Nov 2015 18:35:36 +0100 [thread overview] Message-ID: <1448386536-30118-9-git-send-email-christoffer.dall@linaro.org> (raw) In-Reply-To: <1448386536-30118-1-git-send-email-christoffer.dall@linaro.org> From: Mark Rutland <mark.rutland@arm.com> If we call __kvm_hyp_panic while a guest context is active, we call __restore_sysregs before acquiring the system register values for the panic, in the process throwing away the PAR_EL1 value at the point of the panic. This patch modifies __kvm_hyp_panic to stash the PAR_EL1 value prior to restoring host register values, enabling us to report the original values at the point of the panic. Acked-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> --- arch/arm64/kvm/hyp.S | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S index ce70817..86c2898 100644 --- a/arch/arm64/kvm/hyp.S +++ b/arch/arm64/kvm/hyp.S @@ -864,6 +864,10 @@ ENTRY(__kvm_flush_vm_context) ENDPROC(__kvm_flush_vm_context) __kvm_hyp_panic: + // Stash PAR_EL1 before corrupting it in __restore_sysregs + mrs x0, par_el1 + push x0, xzr + // Guess the context by looking at VTTBR: // If zero, then we're already a host. // Otherwise restore a minimal host context before panicing. @@ -898,7 +902,7 @@ __kvm_hyp_panic: mrs x3, esr_el2 mrs x4, far_el2 mrs x5, hpfar_el2 - mrs x6, par_el1 + pop x6, xzr // active context PAR_EL1 mrs x7, tpidr_el2 mov lr, #(PSR_F_BIT | PSR_I_BIT | PSR_A_BIT | PSR_D_BIT |\ -- 2.1.2.330.g565301e.dirty
WARNING: multiple messages have this Message-ID (diff)
From: christoffer.dall@linaro.org (Christoffer Dall) To: linux-arm-kernel@lists.infradead.org Subject: [PULL 8/8] arm64: kvm: report original PAR_EL1 upon panic Date: Tue, 24 Nov 2015 18:35:36 +0100 [thread overview] Message-ID: <1448386536-30118-9-git-send-email-christoffer.dall@linaro.org> (raw) In-Reply-To: <1448386536-30118-1-git-send-email-christoffer.dall@linaro.org> From: Mark Rutland <mark.rutland@arm.com> If we call __kvm_hyp_panic while a guest context is active, we call __restore_sysregs before acquiring the system register values for the panic, in the process throwing away the PAR_EL1 value at the point of the panic. This patch modifies __kvm_hyp_panic to stash the PAR_EL1 value prior to restoring host register values, enabling us to report the original values at the point of the panic. Acked-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> --- arch/arm64/kvm/hyp.S | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S index ce70817..86c2898 100644 --- a/arch/arm64/kvm/hyp.S +++ b/arch/arm64/kvm/hyp.S @@ -864,6 +864,10 @@ ENTRY(__kvm_flush_vm_context) ENDPROC(__kvm_flush_vm_context) __kvm_hyp_panic: + // Stash PAR_EL1 before corrupting it in __restore_sysregs + mrs x0, par_el1 + push x0, xzr + // Guess the context by looking at VTTBR: // If zero, then we're already a host. // Otherwise restore a minimal host context before panicing. @@ -898,7 +902,7 @@ __kvm_hyp_panic: mrs x3, esr_el2 mrs x4, far_el2 mrs x5, hpfar_el2 - mrs x6, par_el1 + pop x6, xzr // active context PAR_EL1 mrs x7, tpidr_el2 mov lr, #(PSR_F_BIT | PSR_I_BIT | PSR_A_BIT | PSR_D_BIT |\ -- 2.1.2.330.g565301e.dirty
next prev parent reply other threads:[~2015-11-24 17:35 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-11-24 17:35 [PULL 0/8] KVM/ARM Fixes for v4.4-rc3 Christoffer Dall 2015-11-24 17:35 ` Christoffer Dall 2015-11-24 17:35 ` [PULL 1/8] ARM/arm64: KVM: test properly for a PTE's uncachedness Christoffer Dall 2015-11-24 17:35 ` Christoffer Dall 2015-11-24 17:35 ` Christoffer Dall 2015-11-24 17:35 ` [PULL 2/8] arm64: KVM: Fix AArch32 to AArch64 register mapping Christoffer Dall 2015-11-24 17:35 ` Christoffer Dall 2015-11-24 17:35 ` Christoffer Dall 2015-11-24 17:35 ` [PULL 3/8] arm64: KVM: Add workaround for Cortex-A57 erratum 834220 Christoffer Dall 2015-11-24 17:35 ` Christoffer Dall 2015-11-24 17:35 ` Christoffer Dall 2015-11-24 17:35 ` [PULL 4/8] KVM: arm/arm64: Fix preemptible timer active state crazyness Christoffer Dall 2015-11-24 17:35 ` Christoffer Dall 2015-11-24 17:35 ` [PULL 5/8] KVM: arm/arm64: arch_timer: Preserve physical dist. active state on LR.active Christoffer Dall 2015-11-24 17:35 ` Christoffer Dall 2015-11-24 17:35 ` [PULL 6/8] KVM: arm/arm64: vgic: Trust the LR state for HW IRQs Christoffer Dall 2015-11-24 17:35 ` Christoffer Dall 2015-11-24 17:35 ` [PULL 7/8] arm64: kvm: avoid %p in __kvm_hyp_panic Christoffer Dall 2015-11-24 17:35 ` Christoffer Dall 2015-11-24 17:35 ` Christoffer Dall [this message] 2015-11-24 17:35 ` [PULL 8/8] arm64: kvm: report original PAR_EL1 upon panic Christoffer Dall 2015-11-24 18:36 ` [PULL 0/8] KVM/ARM Fixes for v4.4-rc3 Paolo Bonzini 2015-11-24 18:36 ` Paolo Bonzini
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=1448386536-30118-9-git-send-email-christoffer.dall@linaro.org \ --to=christoffer.dall@linaro.org \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=pbonzini@redhat.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.