Commit 522c9a64 authored by Zenghui Yu's avatar Zenghui Yu Committed by Marc Zyngier
Browse files

KVM: arm64: Use kmemleak_free_part_phys() to unregister hyp_mem_base 



With commit 0c24e061 ("mm: kmemleak: add rbtree and store physical
address for objects allocated with PA"), kmemleak started to put the
objects allocated with physical address onto object_phys_tree_root tree.
The kmemleak_free_part() therefore no longer worked as expected on
physically allocated objects (hyp_mem_base in this case) as it attempted to
search and remove things in object_tree_root tree.

Fix it by using kmemleak_free_part_phys() to unregister hyp_mem_base. This
fixes an immediate crash when booting a KVM host in protected mode with
kmemleak enabled.

Signed-off-by: default avatarZenghui Yu <yuzenghui@huawei.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Reviewed-by: default avatarOliver Upton <oliver.upton@linux.dev>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20220908130659.2021-1-yuzenghui@huawei.com
parent 1c23f9e6

arch/arm64/kvm/arm.c

+1 −1
Original line number Diff line number Diff line
@@ -2114,7 +2114,7 @@ static int finalize_hyp_mode(void) 
	 * at, which would end badly once inaccessible.

	 */

	kmemleak_free_part(__hyp_bss_start, __hyp_bss_end - __hyp_bss_start);

	kmemleak_free_part(__va(hyp_mem_base), hyp_mem_size);

	kmemleak_free_part_phys(hyp_mem_base, hyp_mem_size);

	return pkvm_drop_host_privileges();

}