From: Marc Zyngier <marc.zyngier@arm.com> To: Christoffer Dall <christoffer.dall@linaro.org> Cc: "Alex Bennée" <alex.bennee@linaro.org>, "Steve Capper" <Steve.Capper@linaro.org>, "Ard Biesheuvel" <ard.biesheuvel@linaro.org>, "Mark Rutland" <mark.rutland@arm.com>, "Catalin Marinas" <catalin.marinas@arm.com>, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu Subject: [PATCH v3 16/22] arm64: KVM: Add panic handling Date: Mon, 7 Dec 2015 10:53:32 +0000 [thread overview] Message-ID: <1449485618-9443-17-git-send-email-marc.zyngier@arm.com> (raw) In-Reply-To: <1449485618-9443-1-git-send-email-marc.zyngier@arm.com> Add the panic handler, together with the small bits of assembly code to call the kernel's panic implementation. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org> --- arch/arm64/kvm/hyp/hyp-entry.S | 11 ++++++++++- arch/arm64/kvm/hyp/hyp.h | 1 + arch/arm64/kvm/hyp/switch.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/hyp-entry.S b/arch/arm64/kvm/hyp/hyp-entry.S index 818731a..8e58a3b 100644 --- a/arch/arm64/kvm/hyp/hyp-entry.S +++ b/arch/arm64/kvm/hyp/hyp-entry.S @@ -155,7 +155,16 @@ el1_irq: mov x1, #ARM_EXCEPTION_IRQ b __guest_exit -.macro invalid_vector label, target = __kvm_hyp_panic +ENTRY(__hyp_do_panic) + mov lr, #(PSR_F_BIT | PSR_I_BIT | PSR_A_BIT | PSR_D_BIT |\ + PSR_MODE_EL1h) + msr spsr_el2, lr + ldr lr, =panic + msr elr_el2, lr + eret +ENDPROC(__hyp_do_panic) + +.macro invalid_vector label, target = __hyp_panic .align 2 \label: b \target diff --git a/arch/arm64/kvm/hyp/hyp.h b/arch/arm64/kvm/hyp/hyp.h index 70d4f69..fb27517 100644 --- a/arch/arm64/kvm/hyp/hyp.h +++ b/arch/arm64/kvm/hyp/hyp.h @@ -84,6 +84,7 @@ static inline bool __fpsimd_enabled(void) } u64 __guest_enter(struct kvm_vcpu *vcpu, struct kvm_cpu_context *host_ctxt); +void __noreturn __hyp_do_panic(unsigned long, ...); #endif /* __ARM64_KVM_HYP_H__ */ diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c index 608155f..b012870 100644 --- a/arch/arm64/kvm/hyp/switch.c +++ b/arch/arm64/kvm/hyp/switch.c @@ -141,3 +141,33 @@ int __hyp_text __guest_run(struct kvm_vcpu *vcpu) return exit_code; } + +static const char __hyp_panic_string[] = "HYP panic:\nPS:%08llx PC:%016llx ESR:%08llx\nFAR:%016llx HPFAR:%016llx PAR:%016llx\nVCPU:%p\n"; + +void __hyp_text __noreturn __hyp_panic(void) +{ + unsigned long str_va = (unsigned long)__hyp_panic_string; + u64 spsr = read_sysreg(spsr_el2); + u64 elr = read_sysreg(elr_el2); + u64 par = read_sysreg(par_el1); + + if (read_sysreg(vttbr_el2)) { + struct kvm_vcpu *vcpu; + struct kvm_cpu_context *host_ctxt; + + vcpu = (struct kvm_vcpu *)read_sysreg(tpidr_el2); + host_ctxt = kern_hyp_va(vcpu->arch.host_cpu_context); + __deactivate_traps(vcpu); + __deactivate_vm(vcpu); + __sysreg_restore_state(host_ctxt); + } + + /* Call panic for real */ + __hyp_do_panic(hyp_kern_va(str_va), + spsr, elr, + read_sysreg(esr_el2), read_sysreg(far_el2), + read_sysreg(hpfar_el2), par, + (void *)read_sysreg(tpidr_el2)); + + unreachable(); +} -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: marc.zyngier@arm.com (Marc Zyngier) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 16/22] arm64: KVM: Add panic handling Date: Mon, 7 Dec 2015 10:53:32 +0000 [thread overview] Message-ID: <1449485618-9443-17-git-send-email-marc.zyngier@arm.com> (raw) In-Reply-To: <1449485618-9443-1-git-send-email-marc.zyngier@arm.com> Add the panic handler, together with the small bits of assembly code to call the kernel's panic implementation. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org> --- arch/arm64/kvm/hyp/hyp-entry.S | 11 ++++++++++- arch/arm64/kvm/hyp/hyp.h | 1 + arch/arm64/kvm/hyp/switch.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/hyp-entry.S b/arch/arm64/kvm/hyp/hyp-entry.S index 818731a..8e58a3b 100644 --- a/arch/arm64/kvm/hyp/hyp-entry.S +++ b/arch/arm64/kvm/hyp/hyp-entry.S @@ -155,7 +155,16 @@ el1_irq: mov x1, #ARM_EXCEPTION_IRQ b __guest_exit -.macro invalid_vector label, target = __kvm_hyp_panic +ENTRY(__hyp_do_panic) + mov lr, #(PSR_F_BIT | PSR_I_BIT | PSR_A_BIT | PSR_D_BIT |\ + PSR_MODE_EL1h) + msr spsr_el2, lr + ldr lr, =panic + msr elr_el2, lr + eret +ENDPROC(__hyp_do_panic) + +.macro invalid_vector label, target = __hyp_panic .align 2 \label: b \target diff --git a/arch/arm64/kvm/hyp/hyp.h b/arch/arm64/kvm/hyp/hyp.h index 70d4f69..fb27517 100644 --- a/arch/arm64/kvm/hyp/hyp.h +++ b/arch/arm64/kvm/hyp/hyp.h @@ -84,6 +84,7 @@ static inline bool __fpsimd_enabled(void) } u64 __guest_enter(struct kvm_vcpu *vcpu, struct kvm_cpu_context *host_ctxt); +void __noreturn __hyp_do_panic(unsigned long, ...); #endif /* __ARM64_KVM_HYP_H__ */ diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c index 608155f..b012870 100644 --- a/arch/arm64/kvm/hyp/switch.c +++ b/arch/arm64/kvm/hyp/switch.c @@ -141,3 +141,33 @@ int __hyp_text __guest_run(struct kvm_vcpu *vcpu) return exit_code; } + +static const char __hyp_panic_string[] = "HYP panic:\nPS:%08llx PC:%016llx ESR:%08llx\nFAR:%016llx HPFAR:%016llx PAR:%016llx\nVCPU:%p\n"; + +void __hyp_text __noreturn __hyp_panic(void) +{ + unsigned long str_va = (unsigned long)__hyp_panic_string; + u64 spsr = read_sysreg(spsr_el2); + u64 elr = read_sysreg(elr_el2); + u64 par = read_sysreg(par_el1); + + if (read_sysreg(vttbr_el2)) { + struct kvm_vcpu *vcpu; + struct kvm_cpu_context *host_ctxt; + + vcpu = (struct kvm_vcpu *)read_sysreg(tpidr_el2); + host_ctxt = kern_hyp_va(vcpu->arch.host_cpu_context); + __deactivate_traps(vcpu); + __deactivate_vm(vcpu); + __sysreg_restore_state(host_ctxt); + } + + /* Call panic for real */ + __hyp_do_panic(hyp_kern_va(str_va), + spsr, elr, + read_sysreg(esr_el2), read_sysreg(far_el2), + read_sysreg(hpfar_el2), par, + (void *)read_sysreg(tpidr_el2)); + + unreachable(); +} -- 2.1.4
next prev parent reply other threads:[~2015-12-07 10:54 UTC|newest] Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-12-07 10:53 [PATCH v3 00/22] arm64: KVM: Rewriting the world switch in C Marc Zyngier 2015-12-07 10:53 ` Marc Zyngier 2015-12-07 10:53 ` [PATCH v3 01/22] arm64: Add macros to read/write system registers Marc Zyngier 2015-12-07 10:53 ` Marc Zyngier 2015-12-07 17:35 ` Catalin Marinas 2015-12-07 17:35 ` Catalin Marinas 2015-12-07 17:45 ` Mark Rutland 2015-12-07 17:45 ` Mark Rutland 2015-12-07 17:51 ` Marc Zyngier 2015-12-07 17:51 ` Marc Zyngier 2015-12-07 10:53 ` [PATCH v3 02/22] arm64: KVM: Add a HYP-specific header file Marc Zyngier 2015-12-07 10:53 ` Marc Zyngier 2015-12-11 21:19 ` Christoffer Dall 2015-12-11 21:19 ` Christoffer Dall 2015-12-07 10:53 ` [PATCH v3 03/22] arm64: KVM: Implement vgic-v2 save/restore Marc Zyngier 2015-12-07 10:53 ` Marc Zyngier 2015-12-11 20:55 ` Christoffer Dall 2015-12-11 20:55 ` Christoffer Dall 2015-12-07 10:53 ` [PATCH v3 04/22] KVM: arm/arm64: vgic-v3: Make the LR indexing macro public Marc Zyngier 2015-12-07 10:53 ` Marc Zyngier 2015-12-11 20:57 ` Christoffer Dall 2015-12-11 20:57 ` Christoffer Dall 2015-12-07 10:53 ` [PATCH v3 05/22] arm64: KVM: Implement vgic-v3 save/restore Marc Zyngier 2015-12-07 10:53 ` Marc Zyngier 2015-12-07 16:40 ` Mario Smarduch 2015-12-07 16:40 ` Mario Smarduch 2015-12-07 16:52 ` Marc Zyngier 2015-12-07 16:52 ` Marc Zyngier 2015-12-07 17:18 ` Mario Smarduch 2015-12-07 17:18 ` Mario Smarduch 2015-12-07 17:37 ` Marc Zyngier 2015-12-07 17:37 ` Marc Zyngier 2015-12-07 18:05 ` Mario Smarduch 2015-12-07 18:05 ` Mario Smarduch 2015-12-07 18:20 ` Marc Zyngier 2015-12-07 18:20 ` Marc Zyngier 2015-12-08 2:14 ` Mario Smarduch 2015-12-08 2:14 ` Mario Smarduch 2015-12-08 8:19 ` Marc Zyngier 2015-12-08 8:19 ` Marc Zyngier 2015-12-08 8:19 ` Marc Zyngier 2015-12-11 21:04 ` Christoffer Dall 2015-12-11 21:04 ` Christoffer Dall 2015-12-07 10:53 ` [PATCH v3 06/22] arm64: KVM: Implement timer save/restore Marc Zyngier 2015-12-07 10:53 ` Marc Zyngier 2015-12-08 2:18 ` Mario Smarduch 2015-12-08 2:18 ` Mario Smarduch 2015-12-08 10:02 ` Marc Zyngier 2015-12-08 10:02 ` Marc Zyngier 2015-12-11 21:20 ` Christoffer Dall 2015-12-11 21:20 ` Christoffer Dall 2015-12-07 10:53 ` [PATCH v3 07/22] arm64: KVM: Implement system register save/restore Marc Zyngier 2015-12-07 10:53 ` Marc Zyngier 2015-12-11 3:24 ` Mario Smarduch 2015-12-11 3:24 ` Mario Smarduch 2015-12-11 18:29 ` Marc Zyngier 2015-12-11 18:29 ` Marc Zyngier 2015-12-13 4:56 ` Mario Smarduch 2015-12-13 4:56 ` Mario Smarduch 2015-12-07 10:53 ` [PATCH v3 08/22] arm64: KVM: Implement 32bit " Marc Zyngier 2015-12-07 10:53 ` Marc Zyngier 2015-12-07 10:53 ` [PATCH v3 09/22] arm64: KVM: Implement debug save/restore Marc Zyngier 2015-12-07 10:53 ` Marc Zyngier 2015-12-07 10:53 ` [PATCH v3 10/22] arm64: KVM: Implement guest entry Marc Zyngier 2015-12-07 10:53 ` Marc Zyngier 2015-12-14 11:06 ` Christoffer Dall 2015-12-14 11:06 ` Christoffer Dall 2015-12-07 10:53 ` [PATCH v3 11/22] arm64: KVM: Add patchable function selector Marc Zyngier 2015-12-07 10:53 ` Marc Zyngier 2015-12-11 21:21 ` Christoffer Dall 2015-12-11 21:21 ` Christoffer Dall 2015-12-07 10:53 ` [PATCH v3 12/22] arm64: KVM: Implement the core world switch Marc Zyngier 2015-12-07 10:53 ` Marc Zyngier 2015-12-07 10:53 ` [PATCH v3 13/22] arm64: KVM: Implement fpsimd save/restore Marc Zyngier 2015-12-07 10:53 ` Marc Zyngier 2015-12-07 10:53 ` [PATCH v3 14/22] arm64: KVM: Implement TLB handling Marc Zyngier 2015-12-07 10:53 ` Marc Zyngier 2015-12-07 10:53 ` [PATCH v3 15/22] arm64: KVM: HYP mode entry points Marc Zyngier 2015-12-07 10:53 ` Marc Zyngier 2015-12-07 10:53 ` Marc Zyngier [this message] 2015-12-07 10:53 ` [PATCH v3 16/22] arm64: KVM: Add panic handling Marc Zyngier 2015-12-07 10:53 ` [PATCH v3 17/22] arm64: KVM: Add compatibility aliases Marc Zyngier 2015-12-07 10:53 ` Marc Zyngier 2015-12-07 10:53 ` [PATCH v3 18/22] arm64: KVM: Map the kernel RO section into HYP Marc Zyngier 2015-12-07 10:53 ` Marc Zyngier 2015-12-07 10:53 ` [PATCH v3 19/22] arm64: KVM: Move away from the assembly version of the world switch Marc Zyngier 2015-12-07 10:53 ` Marc Zyngier 2015-12-07 10:53 ` [PATCH v3 20/22] arm64: KVM: Turn system register numbers to an enum Marc Zyngier 2015-12-07 10:53 ` Marc Zyngier 2015-12-07 10:53 ` [PATCH v3 21/22] arm64: KVM: Cleanup asm-offset.c Marc Zyngier 2015-12-07 10:53 ` Marc Zyngier 2015-12-07 10:53 ` [PATCH v3 22/22] arm64: KVM: Remove weak attributes Marc Zyngier 2015-12-07 10:53 ` Marc Zyngier 2015-12-14 11:07 ` Christoffer Dall 2015-12-14 11:07 ` 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=1449485618-9443-17-git-send-email-marc.zyngier@arm.com \ --to=marc.zyngier@arm.com \ --cc=Steve.Capper@linaro.org \ --cc=alex.bennee@linaro.org \ --cc=ard.biesheuvel@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=mark.rutland@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.