On Mon, Mar 18, 2013 at 03:24:37PM +0800, Yang Zhang wrote: > From: Yang Zhang <[email protected]> > > reset/restore rtc_status when ioapic reset/restore. > > Signed-off-by: Yang Zhang <[email protected]> > --- > arch/x86/kvm/lapic.c | 8 ++++++++ > arch/x86/kvm/lapic.h | 1 + > virt/kvm/ioapic.c | 33 +++++++++++++++++++++++++++++++++ > 3 files changed, 42 insertions(+), 0 deletions(-) > > diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c > index 6fb22e3..a223170 100644 > --- a/arch/x86/kvm/lapic.c > +++ b/arch/x86/kvm/lapic.c > @@ -94,6 +94,14 @@ static inline int apic_test_vector(int vec, void *bitmap) > return test_bit(VEC_POS(vec), (bitmap) + REG_POS(vec)); > } > > +bool kvm_apic_pending_eoi(struct kvm_vcpu *vcpu, int vector) > +{ > + struct kvm_lapic *apic = vcpu->arch.apic; > + > + return apic_test_vector(vector, apic->regs + APIC_ISR) || > + apic_test_vector(vector, apic->regs + APIC_IRR); > +} > + > static inline void apic_set_vector(int vec, void *bitmap) > { > set_bit(VEC_POS(vec), (bitmap) + REG_POS(vec)); > diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h > index 3a0f9d8..e2a03d1 100644 > --- a/arch/x86/kvm/lapic.h > +++ b/arch/x86/kvm/lapic.h > @@ -160,5 +160,6 @@ void kvm_calculate_eoi_exitmap(struct kvm_vcpu *vcpu, > > void kvm_get_dest_vcpu(struct kvm *kvm, struct kvm_lapic_irq *irq, > unsigned long *vcpu_map); > +bool kvm_apic_pending_eoi(struct kvm_vcpu *vcpu, int vector); > > #endif > diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c > index 659511d..6266d1f 100644 > --- a/virt/kvm/ioapic.c > +++ b/virt/kvm/ioapic.c > @@ -88,6 +88,27 @@ static unsigned long ioapic_read_indirect(struct > kvm_ioapic *ioapic, > } > > #ifdef CONFIG_X86 > +static void rtc_irq_reset(struct kvm_ioapic *ioapic) > +{ > + ioapic->rtc_status.need_eoi = 0; > + bitmap_zero(ioapic->rtc_status.vcpu_map, KVM_MAX_VCPUS); > +} > + > +static void rtc_irq_restore(struct kvm_ioapic *ioapic) > +{ > + struct kvm_vcpu *vcpu; > + int vector, i, need_eoi = 0, rtc_pin = 8; > + > + vector = ioapic->redirtbl[rtc_pin].fields.vector; > + kvm_for_each_vcpu(i, vcpu, ioapic->kvm) { > + if (kvm_apic_pending_eoi(vcpu, vector)) { > + need_eoi++; > + set_bit(vcpu->vcpu_id, ioapic->rtc_status.vcpu_map); > + } > + } > + ioapic->rtc_status.need_eoi = need_eoi; > +} > + > static void rtc_irq_get_dest_vcpu(struct kvm_ioapic *ioapic, int irq) > { > union kvm_ioapic_redirect_entry *entry = &ioapic->redirtbl[irq]; > @@ -111,6 +132,16 @@ static void rtc_irq_get_dest_vcpu(struct kvm_ioapic > *ioapic, int irq) > > #else > > +static void rtc_irq_reset(struct kvm_ioapic *ioapic) > +{ > + return; > +} > + > +static void rtc_irq_restore(struct kvm_ioapic *ioapic) > +{ > + return; > +} > + > static void rtc_irq_get_dest_vcpu(struct kvm_ioapic *ioapic, int irq) > { > return; > @@ -462,6 +493,7 @@ void kvm_ioapic_reset(struct kvm_ioapic *ioapic) > ioapic->ioregsel = 0; > ioapic->irr = 0; > ioapic->id = 0; > + rtc_irq_reset(ioapic); > update_handled_vectors(ioapic); > }
Should also zero the counter if the OS resets the IOAPIC (think reboot via triple-fault with unacked RTC interrupt in ISR/IRR). -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
