From: Shannon Zhao <shannon.zhao@linux•alibaba.com>
To: kvmarm@lists•cs.columbia.edu, maz@kernel•org,
james.morse@arm•com, suzuki.poulose@arm•com,
christoffer.dall@arm•com
Cc: linux-kernel@vger•kernel.org, linux-arm-kernel@lists•infradead.org
Subject: [PATCH RFC 5/7] KVM: arch_timer: Add hyp uninitialize function
Date: Thu, 24 Oct 2019 18:27:48 +0800 [thread overview]
Message-ID: <1571912870-18471-6-git-send-email-shannon.zhao@linux.alibaba.com> (raw)
In-Reply-To: <1571912870-18471-1-git-send-email-shannon.zhao@linux.alibaba.com>
When KVM ARM exits, it needs to cleanup arch_timer setup by kvm_timer_hyp_init.
Signed-off-by: Shannon Zhao <shannon.zhao@linux•alibaba.com>
---
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-10-24 10:29 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-24 10:27 [PATCH RFC 0/7] Support KVM being compiled as a kernel module on arm64 Shannon Zhao
2019-10-24 10:27 ` [PATCH RFC 1/7] KVM: ARM: call hyp_cpu_pm_exit on correct fail and exit path Shannon Zhao
2019-10-24 10:27 ` [PATCH RFC 2/7] KVM: arch_timer: Fix resource leak on error path Shannon Zhao
2019-10-24 10:27 ` [PATCH RFC 3/7] KVM: vgic: make vgic parameters work well for module Shannon Zhao
2019-10-24 10:27 ` [PATCH RFC 4/7] KVM: vgic: Add hyp uninitialize function Shannon Zhao
2019-10-24 10:27 ` Shannon Zhao [this message]
2019-10-24 10:27 ` [PATCH RFC 6/7] KVM: arm/arm64: Move target table register into register table init function Shannon Zhao
2019-10-24 10:27 ` [PATCH RFC 7/7] KVM: ARM: Support KVM being compiled as a kernel module Shannon Zhao
2019-10-24 10:58 ` [PATCH RFC 0/7] Support KVM being compiled as a kernel module on arm64 James Morse
2019-10-24 13:41 ` Marc Zyngier
2019-10-25 2:48 ` Shannon Zhao
2019-10-25 10:12 ` Christoffer Dall
2019-10-25 10:43 ` Marc Zyngier
2019-10-25 2:24 ` Shannon Zhao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1571912870-18471-6-git-send-email-shannon.zhao@linux.alibaba.com \
--to=shannon.zhao@linux$(echo .)alibaba.com \
--cc=christoffer.dall@arm$(echo .)com \
--cc=james.morse@arm$(echo .)com \
--cc=kvmarm@lists$(echo .)cs.columbia.edu \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=maz@kernel$(echo .)org \
--cc=suzuki.poulose@arm$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox