Commit 82f8d543 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch kvm-arm64/mmu/kmemleak-pkvm into kvmarm-master/next 



Prevent kmemleak from peeking into the HYP data, which is fatal
in protected mode.

* kvm-arm64/mmu/kmemleak-pkvm:
  KVM: arm64: Unregister HYP sections from kmemleak in protected mode
  arm64: Move .hyp.rodata outside of the _sdata.._edata range

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents 3ce5db8a 47e6223c

arch/arm64/kernel/vmlinux.lds.S

+2 −2
Original line number Diff line number Diff line
@@ -181,6 +181,8 @@ SECTIONS 
	/* everything from this point to __init_begin will be marked RO NX */

	RO_DATA(PAGE_SIZE)



	HYPERVISOR_DATA_SECTIONS



	idmap_pg_dir = .;

	. += IDMAP_DIR_SIZE;

	idmap_pg_end = .;
@@ -260,8 +262,6 @@ SECTIONS 
	_sdata = .;

	RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, THREAD_ALIGN)



	HYPERVISOR_DATA_SECTIONS



	/*

	 * Data written with the MMU off but read with the MMU on requires

	 * cache lines to be invalidated, discarding up to a Cache Writeback

arch/arm64/kvm/arm.c

+7 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/fs.h>

#include <linux/mman.h>

#include <linux/sched.h>

#include <linux/kmemleak.h>

#include <linux/kvm.h>

#include <linux/kvm_irqfd.h>

#include <linux/irqbypass.h>
@@ -1973,6 +1974,12 @@ static int finalize_hyp_mode(void) 
	if (ret)

		return ret;



	/*

	 * Exclude HYP BSS from kmemleak so that it doesn't get peeked

	 * at, which would end badly once the section is inaccessible.

	 * None of other sections should ever be introspected.

	 */

	kmemleak_free_part(__hyp_bss_start, __hyp_bss_end - __hyp_bss_start);

	ret = pkvm_mark_hyp_section(__hyp_bss);

	if (ret)

		return ret;