Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1d7231c authored by Christoffer Dall's avatar Christoffer Dall
Browse files

KVM: arm/arm64: Fix userspace_irqchip_in_use counting 



We were not decrementing the static key count in the right location.
kvm_arch_vcpu_destroy() is only called to clean up after a failed
VCPU create attempt, whereas kvm_arch_vcpu_free() is called on teardown
of the VM as well.  Move the static key decrement call to
kvm_arch_vcpu_free().

Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent 13e59ece

virt/kvm/arm/arm.c

+3 −2
Original line number Diff line number Diff line
@@ -295,6 +295,9 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) 


void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)

{

	if (vcpu->arch.has_run_once && unlikely(!irqchip_in_kernel(vcpu->kvm)))

		static_branch_dec(&userspace_irqchip_in_use);



	kvm_mmu_free_memory_caches(vcpu);

	kvm_timer_vcpu_terminate(vcpu);

	kvm_pmu_vcpu_destroy(vcpu);
@@ -304,8 +307,6 @@ void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu) 


void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)

{

	if (vcpu->arch.has_run_once && unlikely(!irqchip_in_kernel(vcpu->kvm)))

		static_branch_dec(&userspace_irqchip_in_use);

	kvm_arch_vcpu_free(vcpu);

}