From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcelo Tosatti Subject: Re: [PATCH v2 6/8] KVM: Add reset/restore rtc_status support Date: Tue, 19 Mar 2013 17:55:19 -0300 Message-ID: <20130319205519.GA9057@amt.cnet> References: <1363591479-4653-1-git-send-email-yang.z.zhang@intel.com> <1363591479-4653-7-git-send-email-yang.z.zhang@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: kvm@vger.kernel.org, gleb@redhat.com, xiantao.zhang@intel.com To: Yang Zhang Return-path: Received: from mx1.redhat.com ([209.132.183.28]:26971 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932661Ab3CSVCy (ORCPT ); Tue, 19 Mar 2013 17:02:54 -0400 Content-Disposition: inline In-Reply-To: <1363591479-4653-7-git-send-email-yang.z.zhang@intel.com> Sender: kvm-owner@vger.kernel.org List-ID: On Mon, Mar 18, 2013 at 03:24:37PM +0800, Yang Zhang wrote: > From: Yang Zhang > > reset/restore rtc_status when ioapic reset/restore. > > Signed-off-by: Yang Zhang > --- > 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); > +} > + Should hook into kvm_lapic_reset and kvm_vcpu_ioctl_set_lapic to generate updates. > 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); Why set bit on vcpu_map here?