Merge tag 'kvmarm-fixes-6.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

bonzini · bonzini · commit b4ac28a32f58 · 2022-09-22T17:01:33.000-04:00
KVM/arm64 fixes for 6.0, take #2 - Fix kmemleak usage in Protected KVM (again)
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
@@ -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();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2114,7 +2114,7 @@ static int finalize_hyp_mode(void)`
`2114`	`2114`	`* at, which would end badly once inaccessible.`
`2115`	`2115`	`*/`
`2116`	`2116`	`kmemleak_free_part(__hyp_bss_start, __hyp_bss_end - __hyp_bss_start);`
`2117`		`- kmemleak_free_part(__va(hyp_mem_base), hyp_mem_size);`
	`2117`	`+ kmemleak_free_part_phys(hyp_mem_base, hyp_mem_size);`
`2118`	`2118`	`return pkvm_drop_host_privileges();`
`2119`	`2119`	`}`
`2120`	`2120`