diff options
author | Qing He <qing.he@intel.com> | 2007-09-17 02:47:13 -0400 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2007-10-13 04:18:26 -0400 |
commit | 40487c680d5855459dfdce340df13d40071bb774 (patch) | |
tree | abc0ec56ecb1b6d1533b918621c060a1d38fccef /drivers/kvm/irq.c | |
parent | 5cd4f6fd8506f59cb8a232f364c54f6bd8e5150a (diff) |
KVM: deliver PIC interrupt only to vcpu0
This patch changes the PIC interrupts delivery. Now it is only delivered
to vcpu0 when either condition is met (on vcpu0):
1. local APIC is hardware disabled
2. LVT0 is unmasked and configured to delivery mode ExtInt
It fixes the 2x faster wall clock on x86_64 and SMP i386 Linux guests
Signed-off-by: Eddie (Yaozu) Dong <eddie.dong@intel.com>
Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/kvm/irq.c')
-rw-r--r-- | drivers/kvm/irq.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/kvm/irq.c b/drivers/kvm/irq.c index b88e50115588..7628c7ff628f 100644 --- a/drivers/kvm/irq.c +++ b/drivers/kvm/irq.c | |||
@@ -33,8 +33,11 @@ int kvm_cpu_has_interrupt(struct kvm_vcpu *v) | |||
33 | struct kvm_pic *s; | 33 | struct kvm_pic *s; |
34 | 34 | ||
35 | if (kvm_apic_has_interrupt(v) == -1) { /* LAPIC */ | 35 | if (kvm_apic_has_interrupt(v) == -1) { /* LAPIC */ |
36 | s = pic_irqchip(v->kvm); /* PIC */ | 36 | if (kvm_apic_accept_pic_intr(v)) { |
37 | return s->output; | 37 | s = pic_irqchip(v->kvm); /* PIC */ |
38 | return s->output; | ||
39 | } else | ||
40 | return 0; | ||
38 | } | 41 | } |
39 | return 1; | 42 | return 1; |
40 | } | 43 | } |
@@ -50,9 +53,11 @@ int kvm_cpu_get_interrupt(struct kvm_vcpu *v) | |||
50 | 53 | ||
51 | vector = kvm_get_apic_interrupt(v); /* APIC */ | 54 | vector = kvm_get_apic_interrupt(v); /* APIC */ |
52 | if (vector == -1) { | 55 | if (vector == -1) { |
53 | s = pic_irqchip(v->kvm); | 56 | if (kvm_apic_accept_pic_intr(v)) { |
54 | s->output = 0; /* PIC */ | 57 | s = pic_irqchip(v->kvm); |
55 | vector = kvm_pic_read_irq(s); | 58 | s->output = 0; /* PIC */ |
59 | vector = kvm_pic_read_irq(s); | ||
60 | } | ||
56 | } | 61 | } |
57 | return vector; | 62 | return vector; |
58 | } | 63 | } |