From: Yang Zhang <yang.z.zhang@intel.com>
To: kvm@vger.kernel.org
Cc: gleb@redhat.com, mtosatti@redhat.com, xiantao.zhang@intel.com,
Yang Zhang <yang.z.zhang@Intel.com>
Subject: [PATCH v2 6/8] KVM: Add reset/restore rtc_status support
Date: Mon, 18 Mar 2013 15:24:37 +0800 [thread overview]
Message-ID: <1363591479-4653-7-git-send-email-yang.z.zhang@intel.com> (raw)
In-Reply-To: <1363591479-4653-1-git-send-email-yang.z.zhang@intel.com>
From: Yang Zhang <yang.z.zhang@Intel.com>
reset/restore rtc_status when ioapic reset/restore.
Signed-off-by: Yang Zhang <yang.z.zhang@Intel.com>
---
arch/x86/kvm/lapic.c | 8 ++++++++
arch/x86/kvm/lapic.h | 1 +
virt/kvm/ioapic.c | 33 +++++++++++++++++++++++++++++++++
3 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 6fb22e3..a223170 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -94,6 +94,14 @@ static inline int apic_test_vector(int vec, void *bitmap)
return test_bit(VEC_POS(vec), (bitmap) + REG_POS(vec));
}
+bool kvm_apic_pending_eoi(struct kvm_vcpu *vcpu, int vector)
+{
+ struct kvm_lapic *apic = vcpu->arch.apic;
+
+ return apic_test_vector(vector, apic->regs + APIC_ISR) ||
+ apic_test_vector(vector, apic->regs + APIC_IRR);
+}
+
static inline void apic_set_vector(int vec, void *bitmap)
{
set_bit(VEC_POS(vec), (bitmap) + REG_POS(vec));
diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h
index 3a0f9d8..e2a03d1 100644
--- a/arch/x86/kvm/lapic.h
+++ b/arch/x86/kvm/lapic.h
@@ -160,5 +160,6 @@ void kvm_calculate_eoi_exitmap(struct kvm_vcpu *vcpu,
void kvm_get_dest_vcpu(struct kvm *kvm, struct kvm_lapic_irq *irq,
unsigned long *vcpu_map);
+bool kvm_apic_pending_eoi(struct kvm_vcpu *vcpu, int vector);
#endif
diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
index 659511d..6266d1f 100644
--- a/virt/kvm/ioapic.c
+++ b/virt/kvm/ioapic.c
@@ -88,6 +88,27 @@ static unsigned long ioapic_read_indirect(struct kvm_ioapic *ioapic,
}
#ifdef CONFIG_X86
+static void rtc_irq_reset(struct kvm_ioapic *ioapic)
+{
+ ioapic->rtc_status.need_eoi = 0;
+ bitmap_zero(ioapic->rtc_status.vcpu_map, KVM_MAX_VCPUS);
+}
+
+static void rtc_irq_restore(struct kvm_ioapic *ioapic)
+{
+ struct kvm_vcpu *vcpu;
+ int vector, i, need_eoi = 0, rtc_pin = 8;
+
+ vector = ioapic->redirtbl[rtc_pin].fields.vector;
+ kvm_for_each_vcpu(i, vcpu, ioapic->kvm) {
+ if (kvm_apic_pending_eoi(vcpu, vector)) {
+ need_eoi++;
+ set_bit(vcpu->vcpu_id, ioapic->rtc_status.vcpu_map);
+ }
+ }
+ ioapic->rtc_status.need_eoi = need_eoi;
+}
+
static void rtc_irq_get_dest_vcpu(struct kvm_ioapic *ioapic, int irq)
{
union kvm_ioapic_redirect_entry *entry = &ioapic->redirtbl[irq];
@@ -111,6 +132,16 @@ static void rtc_irq_get_dest_vcpu(struct kvm_ioapic *ioapic, int irq)
#else
+static void rtc_irq_reset(struct kvm_ioapic *ioapic)
+{
+ return;
+}
+
+static void rtc_irq_restore(struct kvm_ioapic *ioapic)
+{
+ return;
+}
+
static void rtc_irq_get_dest_vcpu(struct kvm_ioapic *ioapic, int irq)
{
return;
@@ -462,6 +493,7 @@ void kvm_ioapic_reset(struct kvm_ioapic *ioapic)
ioapic->ioregsel = 0;
ioapic->irr = 0;
ioapic->id = 0;
+ rtc_irq_reset(ioapic);
update_handled_vectors(ioapic);
}
@@ -527,6 +559,7 @@ int kvm_set_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state)
spin_lock(&ioapic->lock);
memcpy(ioapic, state, sizeof(struct kvm_ioapic_state));
update_handled_vectors(ioapic);
+ rtc_irq_restore(ioapic);
kvm_scan_ioapic_entry(kvm);
spin_unlock(&ioapic->lock);
return 0;
--
1.7.1
next prev parent reply other threads:[~2013-03-18 7:29 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-18 7:24 [PATCH v2 0/8] Use eoi to track RTC interrupt delivery status Yang Zhang
2013-03-18 7:24 ` [PATCH v2 1/8] KVM: Parse ioapic entry to get destination vcpu Yang Zhang
2013-03-18 7:24 ` [PATCH v2 2/8] KVM: Rename kvm_ioapic_make_eoibitmap_request to kvm_scan_ioapic_entry Yang Zhang
2013-03-18 7:24 ` [PATCH v2 3/8] KVM: Add vcpu info to ioapic_update_eoi() Yang Zhang
2013-03-18 7:24 ` [PATCH v2 4/8] KVM: Introduce struct rtc_status Yang Zhang
2013-03-18 9:40 ` Gleb Natapov
2013-03-18 10:45 ` Zhang, Yang Z
2013-03-18 7:24 ` [PATCH v2 5/8] KVM: Recalculate destination vcpu map Yang Zhang
2013-03-18 9:45 ` Gleb Natapov
2013-03-18 10:48 ` Zhang, Yang Z
2013-03-18 7:24 ` Yang Zhang [this message]
2013-03-19 20:55 ` [PATCH v2 6/8] KVM: Add reset/restore rtc_status support Marcelo Tosatti
2013-03-20 2:42 ` Zhang, Yang Z
2013-03-20 11:43 ` Zhang, Yang Z
2013-03-19 21:01 ` Marcelo Tosatti
2013-03-20 2:44 ` Zhang, Yang Z
2013-03-18 7:24 ` [PATCH v2 7/8] KVM: Add rtc irq to eoi exit bitmap Yang Zhang
2013-03-18 7:24 ` [PATCH v2 8/8] KVM: Use eoi to track RTC interrupt delivery status Yang Zhang
2013-03-18 10:11 ` Gleb Natapov
2013-03-18 10:49 ` Zhang, Yang Z
2013-03-19 23:28 ` Marcelo Tosatti
2013-03-20 2:47 ` Zhang, Yang Z
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=1363591479-4653-7-git-send-email-yang.z.zhang@intel.com \
--to=yang.z.zhang@intel.com \
--cc=gleb@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=mtosatti@redhat.com \
--cc=xiantao.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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