Reintroduce the __kvm_nvhe_ symbols in kallsyms, ignoring the local symbols in this namespace. The local symbols are not informative and can cause aliasing issues when symbolizing the addresses. With the necessary symbols now in kallsyms we can symbolize nVHE addresses using the %p print format specifier: [ 98.916444][ T426] kvm [426]: nVHE hyp panic at: [<ffffffc0096156fc>] __kvm_nvhe_overflow_stack+0x8/0x34!
Unified · Split
| @@ -295,13 +295,8 @@ void __noreturn __cold nvhe_hyp_panic_handler(u64 esr, u64 spsr, · 294 unmodified lines | ||
| 295 | 295 | u64 elr_in_kimg = __phys_to_kimg(elr_phys); |
| 296 | 296 | u64 hyp_offset = elr_in_kimg - kaslr_offset() - elr_virt; |
| 297 | 297 | u64 mode = spsr & PSR_MODE_MASK; |
| 298 | + u64 panic_addr = elr_virt + hyp_offset; | |
| 298 | 299 | |
| 299 | − /* | |
| 300 | − * The nVHE hyp symbols are not included by kallsyms to avoid issues | |
| 301 | − * with aliasing. That means that the symbols cannot be printed with the | |
| 302 | − * "%pS" format specifier, so fall back to the vmlinux address if | |
| 303 | − * there's no better option. | |
| 304 | − */ | |
| 305 | 300 | if (mode != PSR_MODE_EL2t && mode != PSR_MODE_EL2h) { |
| 306 | 301 | kvm_err("Invalid host exception to nVHE hyp!\n"); |
| 307 | 302 | } else if (ESR_ELx_EC(esr) == ESR_ELx_EC_BRK64 && |
| @@ -321,9 +316,11 @@ void __noreturn __cold nvhe_hyp_panic_handler(u64 esr, u64 spsr, · 13 unmodified lines | ||
| 321 | 316 | if (file) |
| 322 | 317 | kvm_err("nVHE hyp BUG at: %s:%u!\n", file, line); |
| 323 | 318 | else |
| 324 | − kvm_err("nVHE hyp BUG at: %016llx!\n", elr_virt + hyp_offset); | |
| 319 | + kvm_err("nVHE hyp BUG at: [<%016llx>] %pB!\n", panic_addr, | |
| 320 | + (void *)panic_addr); | |
| 325 | 321 | } else { |
| 326 | − kvm_err("nVHE hyp panic at: %016llx!\n", elr_virt + hyp_offset); | |
| 322 | + kvm_err("nVHE hyp panic at: [<%016llx>] %pB!\n", panic_addr, | |
| 323 | + (void *)panic_addr); | |
| 327 | 324 | } |
| 328 | 325 | |
| 329 | 326 | /* |
| @@ -111,7 +111,8 @@ static bool is_ignored_symbol(const char *name, char type) · 110 unmodified lines | ||
| 111 | 111 | ".L", /* local labels, .LBB,.Ltmpxxx,.L__unnamed_xx,.LASANPC, etc. */ |
| 112 | 112 | "__crc_", /* modversions */ |
| 113 | 113 | "__efistub_", /* arm64 EFI stub namespace */ |
| 114 | − "__kvm_nvhe_", /* arm64 non-VHE KVM namespace */ | |
| 114 | + "__kvm_nvhe_$", /* arm64 local symbols in non-VHE KVM namespace */ | |
| 115 | + "__kvm_nvhe_.L", /* arm64 local symbols in non-VHE KVM namespace */ | |
| 115 | 116 | "__AArch64ADRPThunk_", /* arm64 lld */ |
| 116 | 117 | "__ARMV5PILongThunk_", /* arm lld */ |
| 117 | 118 | "__ARMV7PILongThunk_", |