KVM: arm: fix missing free_percpu_irq in kvm_timer_hyp_init()
PATCH RESEND 1/1 KVM: arm: fix missing free_percpu_irq in kvm_timer_hyp_init()
From: Miaohe Lin <[email protected]>
When host_ptimer_irq request irq resource failed, we forget to release the host_vtimer_irq resource already requested. Fix this missing irq release and other similar scenario.
Fixes 9e01dc76be6a ("KVM: arm/arm64: arch_timer: Assign the phys timer on VHE systems")
Signed-off-by Miaohe Lin <[email protected]>
--- virt/kvm/arm/arch_timer.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
virt/kvm/arm/arch_timer.c +8 -5
@@ -935,7 +935,7 @@ int kvm_timer_hyp_init(bool has_gic) kvm_get_running_vcpus());if (err) {kvm_err ("kvm_arch_timer: error setting vcpu affinity\n" ); - goto out_free_irq; + goto out_free_vtime_irq; }static_branch_enable (&has_gic_active_state);
@@ -960,7 +960,7 @@ int kvm_timer_hyp_init(bool has_gic)if (err) {kvm_err ("kvm_arch_timer: can't request ptimer interrupt %d (%d)\n" , host_ptimer_irq, err); -return err; + goto out_free_vtime_irq; }if (has_gic) {
@@ -968,7 +968,7 @@ int kvm_timer_hyp_init(bool has_gic) kvm_get_running_vcpus());if (err) {kvm_err ("kvm_arch_timer: error setting vcpu affinity\n" ); - goto out_free_irq; + goto out_free_ptime_irq; } }
@@ -977,14 +977,17 @@ int kvm_timer_hyp_init(bool has_gic)kvm_err ("kvm_arch_timer: invalid physical timer IRQ: %d\n" , info->physical_irq); err = -ENODEV ; - goto out_free_irq; + goto out_free_vtime_irq; }cpuhp_setup_state (CPUHP_AP_KVM_ARM_TIMER_STARTING ,"kvm/arm/timer:starting" , kvm_timer_starting_cpu, kvm_timer_dying_cpu);return 0 ; -out_free_irq: + +out_free_ptime_irq: +free_percpu_irq (host_ptimer_irq,kvm_get_running_vcpus ()); +out_free_vtime_irq:free_percpu_irq (host_vtimer_irq,kvm_get_running_vcpus ());return err; }
Signature · 1 line
2.19.1