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

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



* kvm-arm64/pkvm-np-guest:
  : .
  : pKVM support for non-protected guests using the standard MM
  : infrastructure, courtesy of Quentin Perret. From the cover letter:
  :
  : "This series moves the stage-2 page-table management of non-protected
  : guests to EL2 when pKVM is enabled. This is only intended as an
  : incremental step towards a 'feature-complete' pKVM, there is however a
  : lot more that needs to come on top.
  :
  : With that series applied, pKVM provides near-parity with standard KVM
  : from a functional perspective all while Linux no longer touches the
  : stage-2 page-tables itself at EL1. The majority of mm-related KVM
  : features work out of the box, including MMU notifiers, dirty logging,
  : RO memslots and things of that nature. There are however two gotchas:
  :
  :  - We don't support mapping devices into guests: this requires
  :    additional hypervisor support for tracking the 'state' of devices,
  :    which will come in a later series. No device assignment until then.
  :
  :  - Stage-2 mappings are forced to page-granularity even when backed by a
  :    huge page for the sake of simplicity of this series. I'm only aiming
  :    at functional parity-ish (from userspace's PoV) for now, support for
  :    HP can be added on top later as a perf improvement."
  : .
  KVM: arm64: Plumb the pKVM MMU in KVM
  KVM: arm64: Introduce the EL1 pKVM MMU
  KVM: arm64: Introduce __pkvm_tlb_flush_vmid()
  KVM: arm64: Introduce __pkvm_host_mkyoung_guest()
  KVM: arm64: Introduce __pkvm_host_test_clear_young_guest()
  KVM: arm64: Introduce __pkvm_host_wrprotect_guest()
  KVM: arm64: Introduce __pkvm_host_relax_guest_perms()
  KVM: arm64: Introduce __pkvm_host_unshare_guest()
  KVM: arm64: Introduce __pkvm_host_share_guest()
  KVM: arm64: Introduce __pkvm_vcpu_{load,put}()
  KVM: arm64: Add {get,put}_pkvm_hyp_vm() helpers
  KVM: arm64: Make kvm_pgtable_stage2_init() a static inline function
  KVM: arm64: Pass walk flags to kvm_pgtable_stage2_relax_perms
  KVM: arm64: Pass walk flags to kvm_pgtable_stage2_mkyoung
  KVM: arm64: Move host page ownership tracking to the hyp vmemmap
  KVM: arm64: Make hyp_page::order a u8
  KVM: arm64: Move enum pkvm_page_state to memory.h
  KVM: arm64: Change the layout of enum pkvm_page_state

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>

# Conflicts:
#	arch/arm64/kvm/arm.c
parents b7bf7c87 fce886a6

arch/arm64/include/asm/kvm_asm.h

+9 −0
Original line number Diff line number Diff line
@@ -64,6 +64,12 @@ enum __kvm_host_smccc_func { 
	/* Hypercalls available after pKVM finalisation */

	__KVM_HOST_SMCCC_FUNC___pkvm_host_share_hyp,

	__KVM_HOST_SMCCC_FUNC___pkvm_host_unshare_hyp,

	__KVM_HOST_SMCCC_FUNC___pkvm_host_share_guest,

	__KVM_HOST_SMCCC_FUNC___pkvm_host_unshare_guest,

	__KVM_HOST_SMCCC_FUNC___pkvm_host_relax_perms_guest,

	__KVM_HOST_SMCCC_FUNC___pkvm_host_wrprotect_guest,

	__KVM_HOST_SMCCC_FUNC___pkvm_host_test_clear_young_guest,

	__KVM_HOST_SMCCC_FUNC___pkvm_host_mkyoung_guest,

	__KVM_HOST_SMCCC_FUNC___kvm_adjust_pc,

	__KVM_HOST_SMCCC_FUNC___kvm_vcpu_run,

	__KVM_HOST_SMCCC_FUNC___kvm_flush_vm_context,
@@ -78,6 +84,9 @@ enum __kvm_host_smccc_func { 
	__KVM_HOST_SMCCC_FUNC___pkvm_init_vm,

	__KVM_HOST_SMCCC_FUNC___pkvm_init_vcpu,

	__KVM_HOST_SMCCC_FUNC___pkvm_teardown_vm,

	__KVM_HOST_SMCCC_FUNC___pkvm_vcpu_load,

	__KVM_HOST_SMCCC_FUNC___pkvm_vcpu_put,

	__KVM_HOST_SMCCC_FUNC___pkvm_tlb_flush_vmid,

};



#define DECLARE_KVM_VHE_SYM(sym)	extern char sym[]

arch/arm64/include/asm/kvm_host.h

+4 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ void kvm_arm_vcpu_destroy(struct kvm_vcpu *vcpu); 
struct kvm_hyp_memcache {

	phys_addr_t head;

	unsigned long nr_pages;

	struct pkvm_mapping *mapping; /* only used from EL1 */

};



static inline void push_hyp_memcache(struct kvm_hyp_memcache *mc,
@@ -775,6 +776,9 @@ struct kvm_vcpu_arch { 
	/* Cache some mmu pages needed inside spinlock regions */

	struct kvm_mmu_memory_cache mmu_page_cache;



	/* Pages to top-up the pKVM/EL2 guest pool */

	struct kvm_hyp_memcache pkvm_memcache;



	/* Virtual SError ESR to restore when HCR_EL2.VSE is set */

	u64 vsesr_el2;

arch/arm64/include/asm/kvm_mmu.h

+16 −0
Original line number Diff line number Diff line
@@ -353,6 +353,22 @@ static inline bool kvm_is_nested_s2_mmu(struct kvm *kvm, struct kvm_s2_mmu *mmu) 
	return &kvm->arch.mmu != mmu;

}



static inline void kvm_fault_lock(struct kvm *kvm)

{

	if (is_protected_kvm_enabled())

		write_lock(&kvm->mmu_lock);

	else

		read_lock(&kvm->mmu_lock);

}



static inline void kvm_fault_unlock(struct kvm *kvm)

{

	if (is_protected_kvm_enabled())

		write_unlock(&kvm->mmu_lock);

	else

		read_unlock(&kvm->mmu_lock);

}



#ifdef CONFIG_PTDUMP_STAGE2_DEBUGFS

void kvm_s2_ptdump_create_debugfs(struct kvm *kvm);

#else

arch/arm64/include/asm/kvm_pgtable.h

+25 −13
Original line number Diff line number Diff line
@@ -412,16 +412,21 @@ static inline bool kvm_pgtable_walk_lock_held(void) 
 *			be used instead of block mappings.

 */

struct kvm_pgtable {

	union {

		struct rb_root					pkvm_mappings;

		struct {

			u32					ia_bits;

			s8					start_level;

			kvm_pteref_t				pgd;

			struct kvm_pgtable_mm_ops		*mm_ops;



			/* Stage-2 only */

	struct kvm_s2_mmu			*mmu;

			enum kvm_pgtable_stage2_flags		flags;

			kvm_pgtable_force_pte_cb_t		force_pte_cb;

		};

	};

	struct kvm_s2_mmu					*mmu;

};



/**

 * kvm_pgtable_hyp_init() - Initialise a hypervisor stage-1 page-table.
@@ -526,8 +531,11 @@ int __kvm_pgtable_stage2_init(struct kvm_pgtable *pgt, struct kvm_s2_mmu *mmu, 
			      enum kvm_pgtable_stage2_flags flags,

			      kvm_pgtable_force_pte_cb_t force_pte_cb);



#define kvm_pgtable_stage2_init(pgt, mmu, mm_ops) \

	__kvm_pgtable_stage2_init(pgt, mmu, mm_ops, 0, NULL)

static inline int kvm_pgtable_stage2_init(struct kvm_pgtable *pgt, struct kvm_s2_mmu *mmu,

					  struct kvm_pgtable_mm_ops *mm_ops)

{

	return __kvm_pgtable_stage2_init(pgt, mmu, mm_ops, 0, NULL);

}



/**

 * kvm_pgtable_stage2_destroy() - Destroy an unused guest stage-2 page-table.
@@ -669,13 +677,15 @@ int kvm_pgtable_stage2_wrprotect(struct kvm_pgtable *pgt, u64 addr, u64 size); 
 * kvm_pgtable_stage2_mkyoung() - Set the access flag in a page-table entry.

 * @pgt:	Page-table structure initialised by kvm_pgtable_stage2_init*().

 * @addr:	Intermediate physical address to identify the page-table entry.

 * @flags:	Flags to control the page-table walk (ex. a shared walk)

 *

 * The offset of @addr within a page is ignored.

 *

 * If there is a valid, leaf page-table entry used to translate @addr, then

 * set the access flag in that entry.

 */

void kvm_pgtable_stage2_mkyoung(struct kvm_pgtable *pgt, u64 addr);

void kvm_pgtable_stage2_mkyoung(struct kvm_pgtable *pgt, u64 addr,

				enum kvm_pgtable_walk_flags flags);



/**

 * kvm_pgtable_stage2_test_clear_young() - Test and optionally clear the access
@@ -705,6 +715,7 @@ bool kvm_pgtable_stage2_test_clear_young(struct kvm_pgtable *pgt, u64 addr, 
 * @pgt:	Page-table structure initialised by kvm_pgtable_stage2_init*().

 * @addr:	Intermediate physical address to identify the page-table entry.

 * @prot:	Additional permissions to grant for the mapping.

 * @flags:	Flags to control the page-table walk (ex. a shared walk)

 *

 * The offset of @addr within a page is ignored.

 *
@@ -717,7 +728,8 @@ bool kvm_pgtable_stage2_test_clear_young(struct kvm_pgtable *pgt, u64 addr, 
 * Return: 0 on success, negative error code on failure.

 */

int kvm_pgtable_stage2_relax_perms(struct kvm_pgtable *pgt, u64 addr,

				   enum kvm_pgtable_prot prot);

				   enum kvm_pgtable_prot prot,

				   enum kvm_pgtable_walk_flags flags);



/**

 * kvm_pgtable_stage2_flush_range() - Clean and invalidate data cache to Point

arch/arm64/include/asm/kvm_pkvm.h

+26 −0
Original line number Diff line number Diff line
@@ -137,4 +137,30 @@ static inline size_t pkvm_host_sve_state_size(void) 
			SVE_SIG_REGS_SIZE(sve_vq_from_vl(kvm_host_sve_max_vl)));

}



struct pkvm_mapping {

	struct rb_node node;

	u64 gfn;

	u64 pfn;

};



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

			     struct kvm_pgtable_mm_ops *mm_ops);

void pkvm_pgtable_stage2_destroy(struct kvm_pgtable *pgt);

int pkvm_pgtable_stage2_map(struct kvm_pgtable *pgt, u64 addr, u64 size, u64 phys,

			    enum kvm_pgtable_prot prot, void *mc,

			    enum kvm_pgtable_walk_flags flags);

int pkvm_pgtable_stage2_unmap(struct kvm_pgtable *pgt, u64 addr, u64 size);

int pkvm_pgtable_stage2_wrprotect(struct kvm_pgtable *pgt, u64 addr, u64 size);

int pkvm_pgtable_stage2_flush(struct kvm_pgtable *pgt, u64 addr, u64 size);

bool pkvm_pgtable_stage2_test_clear_young(struct kvm_pgtable *pgt, u64 addr, u64 size, bool mkold);

int pkvm_pgtable_stage2_relax_perms(struct kvm_pgtable *pgt, u64 addr, enum kvm_pgtable_prot prot,

				    enum kvm_pgtable_walk_flags flags);

void pkvm_pgtable_stage2_mkyoung(struct kvm_pgtable *pgt, u64 addr,

				 enum kvm_pgtable_walk_flags flags);

int pkvm_pgtable_stage2_split(struct kvm_pgtable *pgt, u64 addr, u64 size,

			      struct kvm_mmu_memory_cache *mc);

void pkvm_pgtable_stage2_free_unlinked(struct kvm_pgtable_mm_ops *mm_ops, void *pgtable, s8 level);

kvm_pte_t *pkvm_pgtable_stage2_create_unlinked(struct kvm_pgtable *pgt, u64 phys, s8 level,

					       enum kvm_pgtable_prot prot, void *mc,

					       bool force_pte);

#endif	/* __ARM64_KVM_PKVM_H__ */