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 1/8] KVM: Parse ioapic entry to get destination vcpu
Date: Mon, 18 Mar 2013 15:24:32 +0800 [thread overview]
Message-ID: <1363591479-4653-2-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>
Get destination vcpu map from one ioapic entry.
Signed-off-by: Yang Zhang <yang.z.zhang@Intel.com>
---
arch/x86/kvm/lapic.c | 40 ++++++++++++++++++++++++----------------
arch/x86/kvm/lapic.h | 3 +++
2 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 02b51dd..b4339a5 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -145,28 +145,26 @@ static inline int kvm_apic_id(struct kvm_lapic *apic)
return (kvm_apic_get_reg(apic, APIC_ID) >> 24) & 0xff;
}
-void kvm_calculate_eoi_exitmap(struct kvm_vcpu *vcpu,
- struct kvm_lapic_irq *irq,
- u64 *eoi_exit_bitmap)
+void kvm_get_dest_vcpu(struct kvm *kvm, struct kvm_lapic_irq *irq,
+ unsigned long *vcpu_map)
{
struct kvm_lapic **dst;
struct kvm_apic_map *map;
unsigned long bitmap = 1;
+ struct kvm_vcpu *vcpu;
int i;
rcu_read_lock();
- map = rcu_dereference(vcpu->kvm->arch.apic_map);
+ map = rcu_dereference(kvm->arch.apic_map);
- if (unlikely(!map)) {
- __set_bit(irq->vector, (unsigned long *)eoi_exit_bitmap);
+ if (unlikely(!map))
goto out;
- }
if (irq->dest_mode == 0) { /* physical mode */
- if (irq->delivery_mode == APIC_DM_LOWEST ||
- irq->dest_id == 0xff) {
- __set_bit(irq->vector,
- (unsigned long *)eoi_exit_bitmap);
+ if (irq->dest_id == 0xff) {
+ kvm_for_each_vcpu(i, vcpu, kvm)
+ if (apic_enabled(vcpu->arch.apic))
+ set_bit(vcpu->vcpu_id, vcpu_map);
goto out;
}
dst = &map->phys_map[irq->dest_id & 0xff];
@@ -181,17 +179,27 @@ void kvm_calculate_eoi_exitmap(struct kvm_vcpu *vcpu,
for_each_set_bit(i, &bitmap, 16) {
if (!dst[i])
continue;
- if (dst[i]->vcpu == vcpu) {
- __set_bit(irq->vector,
- (unsigned long *)eoi_exit_bitmap);
- break;
- }
+ set_bit(dst[i]->vcpu->vcpu_id, vcpu_map);
}
out:
rcu_read_unlock();
}
+void kvm_calculate_eoi_exitmap(struct kvm_vcpu *vcpu,
+ struct kvm_lapic_irq *irq,
+ u64 *eoi_exit_bitmap)
+{
+ DECLARE_BITMAP(vcpu_map, KVM_MAX_VCPUS);
+
+ memset(vcpu_map, 0, sizeof(vcpu_map));
+
+ kvm_get_dest_vcpu(vcpu->kvm, irq, vcpu_map);
+ if (test_bit(vcpu->vcpu_id, vcpu_map) ||
+ bitmap_empty(vcpu_map, sizeof(vcpu_map)))
+ __set_bit(irq->vector, (unsigned long *)eoi_exit_bitmap);
+}
+
static void recalculate_apic_map(struct kvm *kvm)
{
struct kvm_apic_map *new, *old = NULL;
diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h
index 1676d34..3a0f9d8 100644
--- a/arch/x86/kvm/lapic.h
+++ b/arch/x86/kvm/lapic.h
@@ -158,4 +158,7 @@ void kvm_calculate_eoi_exitmap(struct kvm_vcpu *vcpu,
struct kvm_lapic_irq *irq,
u64 *eoi_bitmap);
+void kvm_get_dest_vcpu(struct kvm *kvm, struct kvm_lapic_irq *irq,
+ unsigned long *vcpu_map);
+
#endif
--
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 ` Yang Zhang [this message]
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 ` [PATCH v2 6/8] KVM: Add reset/restore rtc_status support Yang Zhang
2013-03-19 20:55 ` 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-2-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