Commit c3e181ae authored by David Brazdil's avatar David Brazdil Committed by Marc Zyngier
Browse files

KVM: arm64: Skip computing hyp VA layout for VHE 



Computing the hyp VA layout is redundant when the kernel runs in EL2 and
hyp shares its VA mappings. Make calling kvm_compute_layout()
conditional on not just CONFIG_KVM but also !is_kernel_in_hyp_mode().

Signed-off-by: default avatarDavid Brazdil <dbrazdil@google.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20201208142452.87237-4-dbrazdil@google.com
parent 7a96a068

arch/arm64/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ static void __init hyp_mode_check(void) 
			   "CPU: CPUs started in inconsistent modes");

	else

		pr_info("CPU: All CPU(s) started at EL1\n");

	if (IS_ENABLED(CONFIG_KVM))

	if (IS_ENABLED(CONFIG_KVM) && !is_kernel_in_hyp_mode())

		kvm_compute_layout();

}