When KVM ARM exits, it needs to cleanup arch_timer setup by kvm_timer_hyp_init.
Signed-off-by: Shannon Zhao <shannon.zhao@xxxxxxxxxxxxxxxxx>
---
include/kvm/arm_arch_timer.h | 1 +
virt/kvm/arm/arch_timer.c | 13 +++++++++++++
virt/kvm/arm/arm.c | 1 +
3 files changed, 15 insertions(+)
diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h
index d120e6c..3cb3a01 100644
--- a/include/kvm/arm_arch_timer.h
+++ b/include/kvm/arm_arch_timer.h
@@ -68,6 +68,7 @@ struct arch_timer_cpu {
};
int kvm_timer_hyp_init(bool);
+void kvm_timer_hyp_uninit(void);
int kvm_timer_enable(struct kvm_vcpu *vcpu);
int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu);
void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu);
diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c
index f5a5d51..7dafa97 100644
--- a/virt/kvm/arm/arch_timer.c
+++ b/virt/kvm/arm/arch_timer.c
@@ -991,6 +991,19 @@ int kvm_timer_hyp_init(bool has_gic)
return err;
}
+void kvm_timer_hyp_uninit(void)
+{
+ struct arch_timer_kvm_info *info = arch_timer_get_kvm_info();
+
+ cpuhp_remove_state(CPUHP_AP_KVM_ARM_TIMER_STARTING);
+ if (info->physical_irq > 0) {
+ on_each_cpu(disable_percpu_irq, (void *)host_ptimer_irq, 1);
+ free_percpu_irq(host_ptimer_irq, kvm_get_running_vcpus());
+ }
+ on_each_cpu(disable_percpu_irq, (void *)host_vtimer_irq, 1);
+ free_percpu_irq(host_vtimer_irq, kvm_get_running_vcpus());
+}
+
void kvm_timer_vcpu_terminate(struct kvm_vcpu *vcpu)
{
struct arch_timer_cpu *timer = vcpu_timer(vcpu);
diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c
index 0c60074..feb6649 100644
--- a/virt/kvm/arm/arm.c
+++ b/virt/kvm/arm/arm.c
@@ -1724,6 +1724,7 @@ int kvm_arch_init(void *opaque)
void kvm_arch_exit(void)
{
kvm_perf_teardown();
+ kvm_timer_hyp_uninit();
kvm_vgic_hyp_uninit();
hyp_cpu_pm_exit();
}
--
1.8.3.1
_______________________________________________
kvmarm mailing list
kvmarm@xxxxxxxxxxxxxxxxxxxxx
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
