[PATCH] KVM: arm64: Fix hypervisor address symbolization

Marc Zyngier maz at kernel.org
Sun Jul 17 03:43:21 PDT 2022


On Sat, 16 Jul 2022 00:58:24 +0100,
Kalesh Singh <kaleshsingh at google.com> wrote:
> 
> With CONFIG_RANDOMIZE_BASE=y vmlinux addresses will resolve correctly

I guess you mean *incorrectly* here, right?

> from kallsyms. Fix this by adding the KASLR offset before printing the
> symbols.
> 
> Based on arm64 for-next/stacktrace.

In general, place these remarks after the '---' line, as they don't
really make sense in the commit itself (which is likely to be merged
on a different base anyway).

> 
> Fixes: 6ccf9cb557bd ("KVM: arm64: Symbolize the nVHE HYP addresses")
> Reported-by: Fuad Tabba <tabba at google.com>
> Signed-off-by: Kalesh Singh <kaleshsingh at google.com>
> ---
>  arch/arm64/kvm/handle_exit.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c
> index f66c0142b335..e43926ef2bc2 100644
> --- a/arch/arm64/kvm/handle_exit.c
> +++ b/arch/arm64/kvm/handle_exit.c
> @@ -347,10 +347,10 @@ void __noreturn __cold nvhe_hyp_panic_handler(u64 esr, u64 spsr,
>  			kvm_err("nVHE hyp BUG at: %s:%u!\n", file, line);
>  		else
>  			kvm_err("nVHE hyp BUG at: [<%016llx>] %pB!\n", panic_addr,
> -					(void *)panic_addr);
> +					(void *)(panic_addr + kaslr_offset()));
>  	} else {
>  		kvm_err("nVHE hyp panic at: [<%016llx>] %pB!\n", panic_addr,
> -				(void *)panic_addr);
> +				(void *)(panic_addr + kaslr_offset()));
>  	}
>  
>  	/*
> 

I'll fix the above as I apply the patch, no need to respin.

Thanks,

	M.

-- 
Without deviation from the norm, progress is not possible.



More information about the linux-arm-kernel mailing list