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

Merge branch kvm-arm64/pkvm-np-thp-6.16 into kvmarm-master/next 



* kvm-arm64/pkvm-np-thp-6.16: (21 commits)
  : .
  : Large mapping support for non-protected pKVM guests, courtesy of
  : Vincent Donnefort. From the cover letter:
  :
  : "This series adds support for stage-2 huge mappings (PMD_SIZE) to pKVM
  : np-guests, that is installing PMD-level mappings in the stage-2,
  : whenever the stage-1 is backed by either Hugetlbfs or THPs."
  : .
  KVM: arm64: np-guest CMOs with PMD_SIZE fixmap
  KVM: arm64: Stage-2 huge mappings for np-guests
  KVM: arm64: Add a range to pkvm_mappings
  KVM: arm64: Convert pkvm_mappings to interval tree
  KVM: arm64: Add a range to __pkvm_host_test_clear_young_guest()
  KVM: arm64: Add a range to __pkvm_host_wrprotect_guest()
  KVM: arm64: Add a range to __pkvm_host_unshare_guest()
  KVM: arm64: Add a range to __pkvm_host_share_guest()
  KVM: arm64: Introduce for_each_hyp_page
  KVM: arm64: Handle huge mappings for np-guest CMOs
  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
  KVM: arm64: Unconditionally cross check hyp state
  KVM: arm64: Defer EL2 stage-1 mapping on share
  KVM: arm64: Move hyp state to hyp_vmemmap
  KVM: arm64: Introduce {get,set}_host_state() helpers
  KVM: arm64: Use 0b11 for encoding PKVM_NOPAGE
  KVM: arm64: Fix pKVM page-tracking comments
  ...

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents 67bd6415 c353fde1

arch/arm64/include/asm/kvm_host.h

+7 −5
Original line number Diff line number Diff line
@@ -971,20 +971,22 @@ struct kvm_vcpu_arch { 
#define vcpu_sve_zcr_elx(vcpu)						\

	(unlikely(is_hyp_ctxt(vcpu)) ? ZCR_EL2 : ZCR_EL1)



#define vcpu_sve_state_size(vcpu) ({					\

#define sve_state_size_from_vl(sve_max_vl) ({				\

	size_t __size_ret;						\

	unsigned int __vcpu_vq;						\

	unsigned int __vq;						\

									\

	if (WARN_ON(!sve_vl_valid((vcpu)->arch.sve_max_vl))) {		\

	if (WARN_ON(!sve_vl_valid(sve_max_vl))) {			\

		__size_ret = 0;						\

	} else {							\

		__vcpu_vq = vcpu_sve_max_vq(vcpu);			\

		__size_ret = SVE_SIG_REGS_SIZE(__vcpu_vq);		\

		__vq = sve_vq_from_vl(sve_max_vl);			\

		__size_ret = SVE_SIG_REGS_SIZE(__vq);			\

	}								\

									\

	__size_ret;							\

})



#define vcpu_sve_state_size(vcpu) sve_state_size_from_vl((vcpu)->arch.sve_max_vl)



#define KVM_GUESTDBG_VALID_MASK (KVM_GUESTDBG_ENABLE | \

				 KVM_GUESTDBG_USE_SW_BP | \

				 KVM_GUESTDBG_USE_HW | \

arch/arm64/include/asm/kvm_pgtable.h

+6 −1
Original line number Diff line number Diff line
@@ -59,6 +59,11 @@ typedef u64 kvm_pte_t; 


#define KVM_PHYS_INVALID		(-1ULL)



#define KVM_PTE_TYPE			BIT(1)

#define KVM_PTE_TYPE_BLOCK		0

#define KVM_PTE_TYPE_PAGE		1

#define KVM_PTE_TYPE_TABLE		1



#define KVM_PTE_LEAF_ATTR_LO		GENMASK(11, 2)



#define KVM_PTE_LEAF_ATTR_LO_S1_ATTRIDX	GENMASK(4, 2)
@@ -413,7 +418,7 @@ static inline bool kvm_pgtable_walk_lock_held(void) 
 */

struct kvm_pgtable {

	union {

		struct rb_root					pkvm_mappings;

		struct rb_root_cached				pkvm_mappings;

		struct {

			u32					ia_bits;

			s8					start_level;

arch/arm64/include/asm/kvm_pkvm.h

+8 −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)
@@ -167,6 +173,8 @@ struct pkvm_mapping { 
	struct rb_node node;

	u64 gfn;

	u64 pfn;

	u64 nr_pages;

	u64 __subtree_last;	/* Internal member for interval tree */

};



int pkvm_pgtable_stage2_init(struct kvm_pgtable *pgt, struct kvm_s2_mmu *mmu,

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);