Commit 1408e73d authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: Restructure the point where has_run_once is advertised 



Restructure kvm_vcpu_first_run_init() to set the has_run_once
flag after having completed all the "run once" activities.

This includes moving the flip of the userspace irqchip static key
to a point where nothing can fail.

Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 052f064d

arch/arm64/kvm/arm.c

+12 −8
Original line number Diff line number Diff line
@@ -600,8 +600,6 @@ static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu) 
	if (!kvm_arm_vcpu_is_finalized(vcpu))

		return -EPERM;



	vcpu->arch.has_run_once = true;



	kvm_arm_vcpu_init_debug(vcpu);



	if (likely(irqchip_in_kernel(kvm))) {
@@ -612,12 +610,6 @@ static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu) 
		ret = kvm_vgic_map_resources(kvm);

		if (ret)

			return ret;

	} else {

		/*

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

		 * VMs in the wild.

		 */

		static_branch_inc(&userspace_irqchip_in_use);

	}



	ret = kvm_timer_enable(vcpu);
@@ -625,6 +617,18 @@ static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu) 
		return ret;



	ret = kvm_arm_pmu_v3_enable(vcpu);

	if (ret)

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

	}



	vcpu->arch.has_run_once = true;



	/*

	 * Initialize traps for protected VMs.