[PATCH v2 1/8] KVM: Parse ioapic entry to get destination vcpu

[Yang Zhang]

From: Yang Zhang <yang.z.zh...@intel.com>

Get destination vcpu map from one ioapic entry.

Signed-off-by: Yang Zhang <yang.z.zh...@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

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html