Commit 5c92a764 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch 'kvm-arm64/nvhe-panic-info' into kvmarm-master/next 



Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents ad569b70 aec0fae6

arch/arm64/include/asm/kvm_hyp.h

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ u64 __guest_enter(struct kvm_vcpu *vcpu); 


bool kvm_host_psci_handler(struct kvm_cpu_context *host_ctxt);



void __noreturn hyp_panic(void);

#ifdef __KVM_NVHE_HYPERVISOR__

void __noreturn __hyp_do_panic(struct kvm_cpu_context *host_ctxt, u64 spsr,

			       u64 elr, u64 par);

arch/arm64/include/asm/kvm_mmu.h

+2 −0
Original line number Diff line number Diff line
@@ -121,6 +121,8 @@ void kvm_update_va_mask(struct alt_instr *alt, 
void kvm_compute_layout(void);

void kvm_apply_hyp_relocations(void);



#define __hyp_pa(x) (((phys_addr_t)(x)) + hyp_physvirt_offset)



static __always_inline unsigned long __kern_hyp_va(unsigned long v)

{

	asm volatile(ALTERNATIVE_CB("and %0, %0, #1\n"

arch/arm64/kernel/image-vars.h

+1 −2
Original line number Diff line number Diff line
@@ -71,8 +71,7 @@ KVM_NVHE_ALIAS(kvm_compute_final_ctr_el0); 
KVM_NVHE_ALIAS(kvm_vgic_global_state);



/* Kernel symbols used to call panic() from nVHE hyp code (via ERET). */

KVM_NVHE_ALIAS(__hyp_panic_string);

KVM_NVHE_ALIAS(panic);

KVM_NVHE_ALIAS(nvhe_hyp_panic_handler);



/* Vectors installed by hyp-init on reset HVC. */

KVM_NVHE_ALIAS(__hyp_stub_vectors);

arch/arm64/kvm/handle_exit.c

+45 −0
Original line number Diff line number Diff line
@@ -291,3 +291,48 @@ void handle_exit_early(struct kvm_vcpu *vcpu, int exception_index) 
	if (exception_index == ARM_EXCEPTION_EL1_SERROR)

		kvm_handle_guest_serror(vcpu, kvm_vcpu_get_esr(vcpu));

}



void __noreturn __cold nvhe_hyp_panic_handler(u64 esr, u64 spsr, u64 elr,

					      u64 par, uintptr_t vcpu,

					      u64 far, u64 hpfar) {

	u64 elr_in_kimg = __phys_to_kimg(__hyp_pa(elr));

	u64 hyp_offset = elr_in_kimg - kaslr_offset() - elr;

	u64 mode = spsr & PSR_MODE_MASK;



	/*

	 * The nVHE hyp symbols are not included by kallsyms to avoid issues

	 * with aliasing. That means that the symbols cannot be printed with the

	 * "%pS" format specifier, so fall back to the vmlinux address if

	 * there's no better option.

	 */

	if (mode != PSR_MODE_EL2t && mode != PSR_MODE_EL2h) {

		kvm_err("Invalid host exception to nVHE hyp!\n");

	} else if (ESR_ELx_EC(esr) == ESR_ELx_EC_BRK64 &&

		   (esr & ESR_ELx_BRK64_ISS_COMMENT_MASK) == BUG_BRK_IMM) {

		struct bug_entry *bug = find_bug(elr_in_kimg);

		const char *file = NULL;

		unsigned int line = 0;



		/* All hyp bugs, including warnings, are treated as fatal. */

		if (bug)

			bug_get_file_line(bug, &file, &line);



		if (file)

			kvm_err("nVHE hyp BUG at: %s:%u!\n", file, line);

		else

			kvm_err("nVHE hyp BUG at: %016llx!\n", elr + hyp_offset);

	} else {

		kvm_err("nVHE hyp panic at: %016llx!\n", elr + hyp_offset);

	}



	/*

	 * Hyp has panicked and we're going to handle that by panicking the

	 * kernel. The kernel offset will be revealed in the panic so we're

	 * also safe to reveal the hyp offset as a debugging aid for translating

	 * hyp VAs to vmlinux addresses.

	 */

	kvm_err("Hyp Offset: 0x%llx\n", hyp_offset);



	panic("HYP panic:\nPS:%08llx PC:%016llx ESR:%08llx\nFAR:%016llx HPFAR:%016llx PAR:%016llx\nVCPU:%016lx\n",

	      spsr, elr, esr, far, hpfar, par, vcpu);

}

arch/arm64/kvm/hyp/include/hyp/switch.h

+0 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ 
#include <asm/processor.h>

#include <asm/thread_info.h>



extern const char __hyp_panic_string[];



extern struct exception_table_entry __start___kvm_ex_table;

extern struct exception_table_entry __stop___kvm_ex_table;