Commit 7fd55a02 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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

KVM/arm64 updates for Linux 5.16

- Simplification of the 'vcpu first run' by integrating it into
  KVM's 'pid change' flow

- Refactoring of the FP and SVE state tracking, also leading to
  a simpler state and less shared data between EL1 and EL2 in
  the nVHE case

- Tidy up the header file usage for the nvhe hyp object

- New HYP unsharing mechanism, finally allowing pages to be
  unmapped from the Stage-1 EL2 page-tables

- Various pKVM cleanups around refcounting and sharing

- A couple of vgic fixes for bugs that would trigger once
  the vcpu xarray rework is merged, but not sooner

- Add minimal support for ARMv8.7's PMU extension

- Rework kvm_pgtable initialisation ahead of the NV work

- New selftest for IRQ injection

- Teach selftests about the lack of default IPA space and
  page sizes

- Expand sysreg selftest to deal with Pointer Authentication

- The usual bunch of cleanups and doc update
parents 5e4e84f1 1c53a1ae

arch/arm64/include/asm/kvm_asm.h

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 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___kvm_adjust_pc,

	__KVM_HOST_SMCCC_FUNC___kvm_vcpu_run,

	__KVM_HOST_SMCCC_FUNC___kvm_flush_vm_context,

arch/arm64/include/asm/kvm_emulate.h

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ static inline void kvm_vcpu_set_be(struct kvm_vcpu *vcpu) 
		*vcpu_cpsr(vcpu) |= PSR_AA32_E_BIT;

	} else {

		u64 sctlr = vcpu_read_sys_reg(vcpu, SCTLR_EL1);

		sctlr |= (1 << 25);

		sctlr |= SCTLR_ELx_EE;

		vcpu_write_sys_reg(vcpu, sctlr, SCTLR_EL1);

	}

}

arch/arm64/include/asm/kvm_host.h

+19 −27
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <asm/fpsimd.h>

#include <asm/kvm.h>

#include <asm/kvm_asm.h>

#include <asm/thread_info.h>



#define __KVM_HAVE_ARCH_INTC_INITIALIZED
@@ -298,9 +297,6 @@ struct kvm_vcpu_arch { 
	/* Exception Information */

	struct kvm_vcpu_fault_info fault;



	/* State of various workarounds, see kvm_asm.h for bit assignment */

	u64 workaround_flags;



	/* Miscellaneous vcpu state flags */

	u64 flags;
@@ -321,8 +317,8 @@ struct kvm_vcpu_arch { 
	struct kvm_guest_debug_arch vcpu_debug_state;

	struct kvm_guest_debug_arch external_debug_state;



	struct thread_info *host_thread_info;	/* hyp VA */

	struct user_fpsimd_state *host_fpsimd_state;	/* hyp VA */

	struct task_struct *parent_task;



	struct {

		/* {Break,watch}point registers */
@@ -367,9 +363,6 @@ struct kvm_vcpu_arch { 
	int target;

	DECLARE_BITMAP(features, KVM_VCPU_MAX_FEATURES);



	/* Detect first run of a vcpu */

	bool has_run_once;



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

	u64 vsesr_el2;
@@ -411,20 +404,17 @@ struct kvm_vcpu_arch { 
#define KVM_ARM64_DEBUG_DIRTY		(1 << 0)

#define KVM_ARM64_FP_ENABLED		(1 << 1) /* guest FP regs loaded */

#define KVM_ARM64_FP_HOST		(1 << 2) /* host FP regs loaded */

#define KVM_ARM64_HOST_SVE_IN_USE	(1 << 3) /* backup for host TIF_SVE */

#define KVM_ARM64_HOST_SVE_ENABLED	(1 << 4) /* SVE enabled for EL0 */

#define KVM_ARM64_GUEST_HAS_SVE		(1 << 5) /* SVE exposed to guest */

#define KVM_ARM64_VCPU_SVE_FINALIZED	(1 << 6) /* SVE config completed */

#define KVM_ARM64_GUEST_HAS_PTRAUTH	(1 << 7) /* PTRAUTH exposed to guest */

#define KVM_ARM64_PENDING_EXCEPTION	(1 << 8) /* Exception pending */

/*

 * Overlaps with KVM_ARM64_EXCEPT_MASK on purpose so that it can't be

 * set together with an exception...

 */

#define KVM_ARM64_INCREMENT_PC		(1 << 9) /* Increment PC */

#define KVM_ARM64_EXCEPT_MASK		(7 << 9) /* Target EL/MODE */

#define KVM_ARM64_DEBUG_STATE_SAVE_SPE	(1 << 12) /* Save SPE context if active  */

#define KVM_ARM64_DEBUG_STATE_SAVE_TRBE	(1 << 13) /* Save TRBE context if active  */



#define KVM_GUESTDBG_VALID_MASK (KVM_GUESTDBG_ENABLE | \

				 KVM_GUESTDBG_USE_SW_BP | \

				 KVM_GUESTDBG_USE_HW | \

				 KVM_GUESTDBG_SINGLESTEP)

/*

 * When KVM_ARM64_PENDING_EXCEPTION is set, KVM_ARM64_EXCEPT_MASK can

 * take the following values:
@@ -442,11 +432,14 @@ struct kvm_vcpu_arch { 
#define KVM_ARM64_EXCEPT_AA64_EL1	(0 << 11)

#define KVM_ARM64_EXCEPT_AA64_EL2	(1 << 11)



/*

 * Overlaps with KVM_ARM64_EXCEPT_MASK on purpose so that it can't be

 * set together with an exception...

 */

#define KVM_ARM64_INCREMENT_PC		(1 << 9) /* Increment PC */

#define KVM_ARM64_DEBUG_STATE_SAVE_SPE	(1 << 12) /* Save SPE context if active  */

#define KVM_ARM64_DEBUG_STATE_SAVE_TRBE	(1 << 13) /* Save TRBE context if active  */

#define KVM_ARM64_FP_FOREIGN_FPSTATE	(1 << 14)



#define KVM_GUESTDBG_VALID_MASK (KVM_GUESTDBG_ENABLE | \

				 KVM_GUESTDBG_USE_SW_BP | \

				 KVM_GUESTDBG_USE_HW | \

				 KVM_GUESTDBG_SINGLESTEP)



#define vcpu_has_sve(vcpu) (system_supports_sve() &&			\

			    ((vcpu)->arch.flags & KVM_ARM64_GUEST_HAS_SVE))
@@ -606,6 +599,8 @@ int __kvm_arm_vcpu_set_events(struct kvm_vcpu *vcpu, 
void kvm_arm_halt_guest(struct kvm *kvm);

void kvm_arm_resume_guest(struct kvm *kvm);



#define vcpu_has_run_once(vcpu)	!!rcu_access_pointer((vcpu)->pid)



#ifndef __KVM_NVHE_HYPERVISOR__

#define kvm_call_hyp_nvhe(f, ...)						\

	({								\
@@ -736,8 +731,10 @@ long kvm_vm_ioctl_mte_copy_tags(struct kvm *kvm, 
/* Guest/host FPSIMD coordination helpers */

int kvm_arch_vcpu_run_map_fp(struct kvm_vcpu *vcpu);

void kvm_arch_vcpu_load_fp(struct kvm_vcpu *vcpu);

void kvm_arch_vcpu_ctxflush_fp(struct kvm_vcpu *vcpu);

void kvm_arch_vcpu_ctxsync_fp(struct kvm_vcpu *vcpu);

void kvm_arch_vcpu_put_fp(struct kvm_vcpu *vcpu);

void kvm_vcpu_unshare_task_fp(struct kvm_vcpu *vcpu);



static inline bool kvm_pmu_counter_deferred(struct perf_event_attr *attr)

{
@@ -748,12 +745,7 @@ static inline bool kvm_pmu_counter_deferred(struct perf_event_attr *attr) 
void kvm_arch_vcpu_load_debug_state_flags(struct kvm_vcpu *vcpu);

void kvm_arch_vcpu_put_debug_state_flags(struct kvm_vcpu *vcpu);



#ifdef CONFIG_KVM /* Avoid conflicts with core headers if CONFIG_KVM=n */

static inline int kvm_arch_vcpu_run_pid_change(struct kvm_vcpu *vcpu)

{

	return kvm_arch_vcpu_run_map_fp(vcpu);

}



#ifdef CONFIG_KVM

void kvm_set_pmu_events(u32 set, struct perf_event_attr *attr);

void kvm_clr_pmu_events(u32 clr);

arch/arm64/include/asm/kvm_hyp.h

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ void __debug_restore_host_buffers_nvhe(struct kvm_vcpu *vcpu); 


void __fpsimd_save_state(struct user_fpsimd_state *fp_regs);

void __fpsimd_restore_state(struct user_fpsimd_state *fp_regs);

void __sve_save_state(void *sve_pffr, u32 *fpsr);

void __sve_restore_state(void *sve_pffr, u32 *fpsr);



#ifndef __KVM_NVHE_HYPERVISOR__

arch/arm64/include/asm/kvm_mmu.h

+2 −0
Original line number Diff line number Diff line
@@ -150,6 +150,8 @@ static __always_inline unsigned long __kern_hyp_va(unsigned long v) 
#include <asm/kvm_pgtable.h>

#include <asm/stage2_pgtable.h>



int kvm_share_hyp(void *from, void *to);

void kvm_unshare_hyp(void *from, void *to);

int create_hyp_mappings(void *from, void *to, enum kvm_pgtable_prot prot);

int create_hyp_io_mappings(phys_addr_t phys_addr, size_t size,

			   void __iomem **kaddr,