Commit 932f72ad authored by He, Qing's avatar He, Qing Committed by Avi Kivity

KVM: round robin for APIC lowest priority delivery mode

Signed-off-by: default avatarQing He <qing.he@intel.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 40487c68
...@@ -413,6 +413,7 @@ struct kvm { ...@@ -413,6 +413,7 @@ struct kvm {
struct kvm_io_bus pio_bus; struct kvm_io_bus pio_bus;
struct kvm_pic *vpic; struct kvm_pic *vpic;
struct kvm_ioapic *vioapic; struct kvm_ioapic *vioapic;
int round_robin_prev_vcpu;
}; };
static inline struct kvm_pic *pic_irqchip(struct kvm *kvm) static inline struct kvm_pic *pic_irqchip(struct kvm *kvm)
......
...@@ -371,12 +371,35 @@ struct kvm_lapic *kvm_apic_round_robin(struct kvm *kvm, u8 vector, ...@@ -371,12 +371,35 @@ struct kvm_lapic *kvm_apic_round_robin(struct kvm *kvm, u8 vector,
unsigned long bitmap) unsigned long bitmap)
{ {
int vcpu_id; int vcpu_id;
int last;
int next;
struct kvm_lapic *apic;
last = kvm->round_robin_prev_vcpu;
next = last;
do {
if (++next == KVM_MAX_VCPUS)
next = 0;
if (kvm->vcpus[next] == NULL || !test_bit(next, &bitmap))
continue;
apic = kvm->vcpus[next]->apic;
if (apic && apic_enabled(apic))
break;
apic = NULL;
} while (next != last);
kvm->round_robin_prev_vcpu = next;
if (!apic) {
vcpu_id = ffs(bitmap) - 1;
if (vcpu_id < 0) {
vcpu_id = 0;
printk(KERN_DEBUG "vcpu not ready for apic_round_robin\n");
}
apic = kvm->vcpus[vcpu_id]->apic;
}
/* TODO for real round robin */ return apic;
vcpu_id = fls(bitmap) - 1;
if (vcpu_id < 0)
printk(KERN_DEBUG "vcpu not ready for apic_round_robin\n");
return kvm->vcpus[vcpu_id]->apic;
} }
static void apic_set_eoi(struct kvm_lapic *apic) static void apic_set_eoi(struct kvm_lapic *apic)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment