ANDROID: KVM: arm64: Always resolve nvhe BUGs file and line
ELR virt address is always shared by the hypervisor and then compared against a host accessible ELF section. Also, Now pKVM prefaults the entire host stage-2, we are not at risk of triggering a memory abort in the panic path. There is no need to hide that feature behind NVHE_EL2_DEBUG anymore. Bug: 357781595 Change-Id: I8251ba636dd8ab7de276027fa542bbe43eccb297 Signed-off-by: Vincent Donnefort <vdonnefort@google.com>
This commit is contained in:
@@ -553,17 +553,13 @@ void __noreturn __cold nvhe_hyp_panic_handler(u64 esr, u64 spsr,
|
||||
kvm_err("Invalid host exception to nVHE hyp!\n");
|
||||
} else if (ESR_ELx_EC(esr) == ESR_ELx_EC_BRK64 &&
|
||||
esr_brk_comment(esr) == 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 (!is_protected_kvm_enabled() ||
|
||||
IS_ENABLED(CONFIG_NVHE_EL2_DEBUG)) {
|
||||
struct bug_entry *bug = find_bug(elr_in_kimg);
|
||||
|
||||
if (bug)
|
||||
bug_get_file_line(bug, &file, &line);
|
||||
}
|
||||
if (bug)
|
||||
bug_get_file_line(bug, &file, &line);
|
||||
|
||||
if (file)
|
||||
kvm_err("nVHE hyp BUG at: %s:%u!\n", file, line);
|
||||
|
||||
Reference in New Issue
Block a user