Commit d5702dd2 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch kvm-arm64/pkvm-selftest-6.16 into kvm-arm64/pkvm-np-thp-6.16 

* kvm-arm64/pkvm-selftest-6.16:
  : .
  : pKVM selftests covering the memory ownership transitions by
  : Quentin Perret. From the initial cover letter:
  :
  : "We have recently found a bug [1] in the pKVM memory ownership
  : transitions by code inspection, but it could have been caught with a
  : test.
  :
  : Introduce a boot-time selftest exercising all the known pKVM memory
  : transitions and importantly checks the rejection of illegal transitions.
  :
  : The new test is hidden behind a new Kconfig option separate from
  : CONFIG_EL2_NVHE_DEBUG on purpose as that has side effects on the
  : transition checks ([1] doesn't reproduce with EL2 debug enabled).
  :
  : [1] https://lore.kernel.org/kvmarm/20241128154406.602875-1-qperret@google.com/

"
  : .
  KVM: arm64: Extend pKVM selftest for np-guests
  KVM: arm64: Selftest for pKVM transitions
  KVM: arm64: Don't WARN from __pkvm_host_share_guest()
  KVM: arm64: Add .hyp.data section

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents cd6b97bc 48d56450

arch/arm64/include/asm/kvm_pkvm.h

+6 −0
Original line number Diff line number Diff line
@@ -135,6 +135,12 @@ static inline unsigned long host_s2_pgtable_pages(void) 
	return res;

}



#ifdef CONFIG_NVHE_EL2_DEBUG

static inline unsigned long pkvm_selftest_pages(void) { return 32; }

#else

static inline unsigned long pkvm_selftest_pages(void) { return 0; }

#endif



#define KVM_FFA_MBOX_NR_PAGES	1



static inline unsigned long hyp_ffa_proxy_pages(void)

arch/arm64/include/asm/sections.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ extern char __alt_instructions[], __alt_instructions_end[]; 
extern char __hibernate_exit_text_start[], __hibernate_exit_text_end[];

extern char __hyp_idmap_text_start[], __hyp_idmap_text_end[];

extern char __hyp_text_start[], __hyp_text_end[];

extern char __hyp_data_start[], __hyp_data_end[];

extern char __hyp_rodata_start[], __hyp_rodata_end[];

extern char __hyp_reloc_begin[], __hyp_reloc_end[];

extern char __hyp_bss_start[], __hyp_bss_end[];

arch/arm64/kernel/image-vars.h

+2 −0
Original line number Diff line number Diff line
@@ -127,6 +127,8 @@ KVM_NVHE_ALIAS(__hyp_text_start); 
KVM_NVHE_ALIAS(__hyp_text_end);

KVM_NVHE_ALIAS(__hyp_bss_start);

KVM_NVHE_ALIAS(__hyp_bss_end);

KVM_NVHE_ALIAS(__hyp_data_start);

KVM_NVHE_ALIAS(__hyp_data_end);

KVM_NVHE_ALIAS(__hyp_rodata_start);

KVM_NVHE_ALIAS(__hyp_rodata_end);

arch/arm64/kernel/vmlinux.lds.S

+15 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
	*(__kvm_ex_table)					\

	__stop___kvm_ex_table = .;



#define HYPERVISOR_DATA_SECTIONS				\

#define HYPERVISOR_RODATA_SECTIONS				\

	HYP_SECTION_NAME(.rodata) : {				\

		. = ALIGN(PAGE_SIZE);				\

		__hyp_rodata_start = .;				\
@@ -23,6 +23,15 @@ 
		__hyp_rodata_end = .;				\

	}



#define HYPERVISOR_DATA_SECTION					\

	HYP_SECTION_NAME(.data) : {				\

		. = ALIGN(PAGE_SIZE);				\

		__hyp_data_start = .;				\

		*(HYP_SECTION_NAME(.data))			\

		. = ALIGN(PAGE_SIZE);				\

		__hyp_data_end = .;				\

	}



#define HYPERVISOR_PERCPU_SECTION				\

	. = ALIGN(PAGE_SIZE);					\

	HYP_SECTION_NAME(.data..percpu) : {			\
@@ -51,7 +60,8 @@ 
#define SBSS_ALIGN			PAGE_SIZE

#else /* CONFIG_KVM */

#define HYPERVISOR_EXTABLE

#define HYPERVISOR_DATA_SECTIONS

#define HYPERVISOR_RODATA_SECTIONS

#define HYPERVISOR_DATA_SECTION

#define HYPERVISOR_PERCPU_SECTION

#define HYPERVISOR_RELOC_SECTION

#define SBSS_ALIGN			0
@@ -190,7 +200,7 @@ SECTIONS 
	/* everything from this point to __init_begin will be marked RO NX */

	RO_DATA(PAGE_SIZE)



	HYPERVISOR_DATA_SECTIONS

	HYPERVISOR_RODATA_SECTIONS



	.got : { *(.got) }

	/*
@@ -295,6 +305,8 @@ SECTIONS 
	_sdata = .;

	RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, THREAD_ALIGN)



	HYPERVISOR_DATA_SECTION



	/*

	 * 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
@@ -2604,6 +2604,13 @@ static int __init init_hyp_mode(void) 
		goto out_err;

	}



	err = create_hyp_mappings(kvm_ksym_ref(__hyp_data_start),

				  kvm_ksym_ref(__hyp_data_end), PAGE_HYP);

	if (err) {

		kvm_err("Cannot map .hyp.data section\n");

		goto out_err;

	}



	err = create_hyp_mappings(kvm_ksym_ref(__hyp_rodata_start),

				  kvm_ksym_ref(__hyp_rodata_end), PAGE_HYP_RO);

	if (err) {