diff options
author | David Brazdil <dbrazdil@google.com> | 2020-12-08 14:24:48 +0000 |
---|---|---|
committer | Marc Zyngier <maz@kernel.org> | 2020-12-22 10:48:50 +0000 |
commit | 7a96a0687b80a1870c689418d7b72012c8bdd53d (patch) | |
tree | a342dae9f239d8e1908e06168272d154169fbd33 | |
parent | ff367fe473a9857160c17827931375a899076394 (diff) | |
download | linux-7a96a0687b80a1870c689418d7b72012c8bdd53d.tar.gz linux-7a96a0687b80a1870c689418d7b72012c8bdd53d.tar.bz2 linux-7a96a0687b80a1870c689418d7b72012c8bdd53d.zip |
KVM: arm64: Use lm_alias in nVHE-only VA conversion
init_hyp_physvirt_offset() computes PA from a kernel VA. Conversion to
kernel linear-map is required first but the code used kvm_ksym_ref() for
this purpose. Under VHE that is a NOP and resulted in a runtime warning.
Replace kvm_ksym_ref with lm_alias.
Reported-by: Qian Cai <qcai@redhat.com>
Signed-off-by: David Brazdil <dbrazdil@google.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20201208142452.87237-3-dbrazdil@google.com
-rw-r--r-- | arch/arm64/kvm/va_layout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/va_layout.c b/arch/arm64/kvm/va_layout.c index d8cc51bd60bf..914732b88c69 100644 --- a/arch/arm64/kvm/va_layout.c +++ b/arch/arm64/kvm/va_layout.c @@ -42,7 +42,7 @@ static void init_hyp_physvirt_offset(void) u64 kern_va, hyp_va; /* Compute the offset from the hyp VA and PA of a random symbol. */ - kern_va = (u64)kvm_ksym_ref(__hyp_text_start); + kern_va = (u64)lm_alias(__hyp_text_start); hyp_va = __early_kern_hyp_va(kern_va); CHOOSE_NVHE_SYM(hyp_physvirt_offset) = (s64)__pa(kern_va) - (s64)hyp_va; } |