Commit 64a1fbda authored by Quentin Perret's avatar Quentin Perret Committed by Marc Zyngier
Browse files

KVM: arm64: pkvm: Make kvm_host_owns_hyp_mappings() robust to VHE 



The kvm_host_owns_hyp_mappings() function should return true if and only
if the host kernel is responsible for creating the hypervisor stage-1
mappings. That is only possible in standard non-VHE mode, or during boot
in protected nVHE mode. But either way, none of this makes sense in VHE,
so make sure to catch this case as well, hence making the function
return sensible values in any context (VHE or not).

Suggested-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarQuentin Perret <qperret@google.com>
Acked-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20211208152300.2478542-7-qperret@google.com
parent bff01cb6

arch/arm64/kvm/mmu.c

+3 −0
Original line number Diff line number Diff line
@@ -239,6 +239,9 @@ void free_hyp_pgds(void) 


static bool kvm_host_owns_hyp_mappings(void)

{

	if (is_kernel_in_hyp_mode())

		return false;



	if (static_branch_likely(&kvm_protected_mode_initialized))

		return false;