Commit fbf3372b authored by Oliver Upton's avatar Oliver Upton
Browse files

Merge branch kvm-arm64/misc into kvmarm/next 



* kvm-arm64/misc:
  : Miscellaneous updates
  :
  :  - Drop useless check against vgic state in ICC_CLTR_EL1.SEIS read
  :    emulation
  :
  :  - Fix trap configuration for pKVM
  :
  :  - Close the door on initialization bugs surrounding userspace irqchip
  :    static key by removing it.
  KVM: selftests: Don't bother deleting memslots in KVM when freeing VMs
  KVM: arm64: Get rid of userspace_irqchip_in_use
  KVM: arm64: Initialize trap register values in hyp in pKVM
  KVM: arm64: Initialize the hypervisor's VM state at EL2
  KVM: arm64: Refactor kvm_vcpu_enable_ptrauth() for hyp use
  KVM: arm64: Move pkvm_vcpu_init_traps() to init_pkvm_hyp_vcpu()
  KVM: arm64: Don't map 'kvm_vgic_global_state' at EL2 with pKVM
  KVM: arm64: Just advertise SEIS as 0 when emulating ICC_CTLR_EL1

Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parents 24bb1811 5afe18df

arch/arm64/include/asm/kvm_asm.h

+0 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ enum __kvm_host_smccc_func { 
	__KVM_HOST_SMCCC_FUNC___kvm_timer_set_cntvoff,

	__KVM_HOST_SMCCC_FUNC___vgic_v3_save_vmcr_aprs,

	__KVM_HOST_SMCCC_FUNC___vgic_v3_restore_vmcr_aprs,

	__KVM_HOST_SMCCC_FUNC___pkvm_vcpu_init_traps,

	__KVM_HOST_SMCCC_FUNC___pkvm_init_vm,

	__KVM_HOST_SMCCC_FUNC___pkvm_init_vcpu,

	__KVM_HOST_SMCCC_FUNC___pkvm_teardown_vm,

arch/arm64/include/asm/kvm_emulate.h

+4 −0
Original line number Diff line number Diff line
@@ -693,4 +693,8 @@ static inline bool guest_hyp_sve_traps_enabled(const struct kvm_vcpu *vcpu) 
	return __guest_hyp_cptr_xen_trap_enabled(vcpu, ZEN);

}



static inline void kvm_vcpu_enable_ptrauth(struct kvm_vcpu *vcpu)

{

	vcpu_set_flag(vcpu, GUEST_HAS_PTRAUTH);

}

#endif /* __ARM64_KVM_EMULATE_H__ */

arch/arm64/include/asm/kvm_host.h

+0 −2
Original line number Diff line number Diff line
@@ -74,8 +74,6 @@ enum kvm_mode kvm_get_mode(void); 
static inline enum kvm_mode kvm_get_mode(void) { return KVM_MODE_NONE; };

#endif



DECLARE_STATIC_KEY_FALSE(userspace_irqchip_in_use);



extern unsigned int __ro_after_init kvm_sve_max_vl;

extern unsigned int __ro_after_init kvm_host_sve_max_vl;

int __init kvm_arm_init_sve(void);

arch/arm64/kvm/arch_timer.c

+1 −2
Original line number Diff line number Diff line
@@ -206,8 +206,7 @@ void get_timer_map(struct kvm_vcpu *vcpu, struct timer_map *map) 


static inline bool userspace_irqchip(struct kvm *kvm)

{

	return static_branch_unlikely(&userspace_irqchip_in_use) &&

		unlikely(!irqchip_in_kernel(kvm));

	return unlikely(!irqchip_in_kernel(kvm));

}



static void soft_timer_start(struct hrtimer *hrt, u64 ns)

arch/arm64/kvm/arm.c

+3 −23
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ DECLARE_KVM_NVHE_PER_CPU(struct kvm_cpu_context, kvm_hyp_ctxt); 
static bool vgic_present, kvm_arm_initialised;



static DEFINE_PER_CPU(unsigned char, kvm_hyp_initialized);

DEFINE_STATIC_KEY_FALSE(userspace_irqchip_in_use);



bool is_kvm_arm_initialised(void)

{
@@ -503,9 +502,6 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) 


void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)

{

	if (vcpu_has_run_once(vcpu) && unlikely(!irqchip_in_kernel(vcpu->kvm)))

		static_branch_dec(&userspace_irqchip_in_use);



	kvm_mmu_free_memory_cache(&vcpu->arch.mmu_page_cache);

	kvm_timer_vcpu_terminate(vcpu);

	kvm_pmu_vcpu_destroy(vcpu);
@@ -848,22 +844,6 @@ int kvm_arch_vcpu_run_pid_change(struct kvm_vcpu *vcpu) 
			return ret;

	}



	if (!irqchip_in_kernel(kvm)) {

		/*

		 * Tell the rest of the code that there are userspace irqchip

		 * VMs in the wild.

		 */

		static_branch_inc(&userspace_irqchip_in_use);

	}



	/*

	 * Initialize traps for protected VMs.

	 * NOTE: Move to run in EL2 directly, rather than via a hypercall, once

	 * the code is in place for first run initialization at EL2.

	 */

	if (kvm_vm_is_protected(kvm))

		kvm_call_hyp_nvhe(__pkvm_vcpu_init_traps, vcpu);



	mutex_lock(&kvm->arch.config_lock);

	set_bit(KVM_ARCH_FLAG_HAS_RAN_ONCE, &kvm->arch.flags);

	mutex_unlock(&kvm->arch.config_lock);
@@ -1077,7 +1057,7 @@ static bool kvm_vcpu_exit_request(struct kvm_vcpu *vcpu, int *ret) 
	 * state gets updated in kvm_timer_update_run and

	 * kvm_pmu_update_run below).

	 */

	if (static_branch_unlikely(&userspace_irqchip_in_use)) {

	if (unlikely(!irqchip_in_kernel(vcpu->kvm))) {

		if (kvm_timer_should_notify_user(vcpu) ||

		    kvm_pmu_should_notify_user(vcpu)) {

			*ret = -EINTR;
@@ -1199,7 +1179,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) 
			vcpu->mode = OUTSIDE_GUEST_MODE;

			isb(); /* Ensure work in x_flush_hwstate is committed */

			kvm_pmu_sync_hwstate(vcpu);

			if (static_branch_unlikely(&userspace_irqchip_in_use))

			if (unlikely(!irqchip_in_kernel(vcpu->kvm)))

				kvm_timer_sync_user(vcpu);

			kvm_vgic_sync_hwstate(vcpu);

			local_irq_enable();
@@ -1245,7 +1225,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) 
		 * we don't want vtimer interrupts to race with syncing the

		 * timer virtual interrupt state.

		 */

		if (static_branch_unlikely(&userspace_irqchip_in_use))

		if (unlikely(!irqchip_in_kernel(vcpu->kvm)))

			kvm_timer_sync_user(vcpu);



		kvm_arch_vcpu_ctxsync_fp(vcpu);