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/lapic.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/lapic.c')
-rw-r--r-- | drivers/kvm/lapic.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/kvm/lapic.c b/drivers/kvm/lapic.c index 2706ec36c258..01e769672dcc 100644 --- a/drivers/kvm/lapic.c +++ b/drivers/kvm/lapic.c | |||
@@ -788,6 +788,8 @@ static void lapic_reset(struct kvm_vcpu *vcpu) | |||
788 | 788 | ||
789 | for (i = 0; i < APIC_LVT_NUM; i++) | 789 | for (i = 0; i < APIC_LVT_NUM; i++) |
790 | apic_set_reg(apic, APIC_LVTT + 0x10 * i, APIC_LVT_MASKED); | 790 | apic_set_reg(apic, APIC_LVTT + 0x10 * i, APIC_LVT_MASKED); |
791 | apic_set_reg(apic, APIC_LVT0, | ||
792 | SET_APIC_DELIVERY_MODE(0, APIC_MODE_EXTINT)); | ||
791 | 793 | ||
792 | apic_set_reg(apic, APIC_DFR, 0xffffffffU); | 794 | apic_set_reg(apic, APIC_DFR, 0xffffffffU); |
793 | apic_set_reg(apic, APIC_SPIV, 0xff); | 795 | apic_set_reg(apic, APIC_SPIV, 0xff); |
@@ -932,6 +934,21 @@ int kvm_apic_has_interrupt(struct kvm_vcpu *vcpu) | |||
932 | return highest_irr; | 934 | return highest_irr; |
933 | } | 935 | } |
934 | 936 | ||
937 | int kvm_apic_accept_pic_intr(struct kvm_vcpu *vcpu) | ||
938 | { | ||
939 | u32 lvt0 = apic_get_reg(vcpu->apic, APIC_LVT0); | ||
940 | int r = 0; | ||
941 | |||
942 | if (vcpu->vcpu_id == 0) { | ||
943 | if (!apic_hw_enabled(vcpu->apic)) | ||
944 | r = 1; | ||
945 | if ((lvt0 & APIC_LVT_MASKED) == 0 && | ||
946 | GET_APIC_DELIVERY_MODE(lvt0) == APIC_MODE_EXTINT) | ||
947 | r = 1; | ||
948 | } | ||
949 | return r; | ||
950 | } | ||
951 | |||
935 | void kvm_inject_apic_timer_irqs(struct kvm_vcpu *vcpu) | 952 | void kvm_inject_apic_timer_irqs(struct kvm_vcpu *vcpu) |
936 | { | 953 | { |
937 | struct kvm_lapic *apic = vcpu->apic; | 954 | struct kvm_lapic *apic = vcpu->apic; |