Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Sun, 17 Jul 2022 11:43:21 +0100
Message-ID: <87zgh8yq7q.wl-maz@kernel.org>
From:   Marc Zyngier <maz@kernel.org>
To:     Kalesh Singh <kaleshsingh@google.com>
Cc:     mark.rutland@arm.com, broonie@kernel.org,
        madvenka@linux.microsoft.com, tabba@google.com, will@kernel.org,
        qperret@google.com, android-mm@google.com, kernel-team@android.com,
        James Morse <james.morse@arm.com>,
        Alexandru Elisei <alexandru.elisei@arm.com>,
        Suzuki K Poulose <suzuki.poulose@arm.com>,
        Catalin Marinas <catalin.marinas@arm.com>,
        linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] KVM: arm64: Fix hypervisor address symbolization
In-Reply-To: <20220715235824.2549012-1-kaleshsingh@google.com>
References: <20220715235824.2549012-1-kaleshsingh@google.com>
User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue)
 FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/27.1
 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO)
MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue")
Content-Type: text/plain; charset=US-ASCII
Precedence: bulk

On Sat, 16 Jul 2022 00:58:24 +0100,
Kalesh Singh <kaleshsingh@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@google.com>
> Signed-off-by: Kalesh Singh <kaleshsingh@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.