History

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

KVM/arm64 fixes for 5.19, take #2 - Fix a regression with pKVM when kmemleak is enabled - Add Oliver Upton as an official KVM/arm64 reviewer

Paolo Bonzini committed 4 years ago

Commit 922d4572 parents 9e2f649 cbc6d442 files · +4 −3Browse files

Unified · Split

2 files
  1. MAINTAINERS +1 −0
  2. arch/arm64/kvm/arm.c +3 −3
MAINTAINERS+1−0
@@ -10830,6 +10830,7 @@ M: Marc Zyngier <maz@kernel.org> · 10829 unmodified lines
1083010830 R: James Morse <james.morse@arm.com>
1083110831 R: Alexandru Elisei <alexandru.elisei@arm.com>
1083210832 R: Suzuki K Poulose <suzuki.poulose@arm.com>
10833+R: Oliver Upton <oliver.upton@linux.dev>
1083310834 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1083410835 L: kvmarm@lists.cs.columbia.edu (moderated for non-subscribers)
1083510836 S: Maintained
arch/arm64/kvm/arm.c+3−3
@@ -2112,11 +2112,11 @@ static int finalize_hyp_mode(void) · 2111 unmodified lines
21122112 return 0;
21132113
21142114 /*
2115− * Exclude HYP BSS from kmemleak so that it doesn't get peeked
2116− * at, which would end badly once the section is inaccessible.
2117− * None of other sections should ever be introspected.
2115+ * Exclude HYP sections from kmemleak so that they don't get peeked
2116+ * at, which would end badly once inaccessible.
21182117 */
21192118 kmemleak_free_part(__hyp_bss_start, __hyp_bss_end - __hyp_bss_start);
2119+ kmemleak_free_part(__va(hyp_mem_base), hyp_mem_size);
21202120 return pkvm_drop_host_privileges();
21212121 }
21222122