KVM: arm/arm64: Fix userspace_irqchip_in_use counting

Web:        https://git.kernel.org/torvalds/c/f1d7231cede93a42d75b6d3c5ca599e94a273e89
Commit:     f1d7231cede93a42d75b6d3c5ca599e94a273e89
Parent:     13e59ece5b30f39e4e1e1fac2b2ddc7ed527f3cc
Refname:    refs/heads/master
Author:     Christoffer Dall <[email protected]>
AuthorDate: Thu Jan 25 18:32:29 2018 +0100
Committer:  Christoffer Dall <[email protected]>
CommitDate: Wed Jan 31 10:10:38 2018 +0100

    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: Marc Zyngier <[email protected]>
    Signed-off-by: Christoffer Dall <[email protected]>
---
 virt/kvm/arm/arm.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c
index 639dca0c0560..04ee7a327870 100644
--- a/virt/kvm/arm/arm.c
+++ b/virt/kvm/arm/arm.c
@@ -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);
 }
 
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html