From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gleb Natapov Subject: Re: [PATCH v2 5/8] KVM: Recalculate destination vcpu map Date: Mon, 18 Mar 2013 11:45:01 +0200 Message-ID: <20130318094501.GC4020@redhat.com> References: <1363591479-4653-1-git-send-email-yang.z.zhang@intel.com> <1363591479-4653-6-git-send-email-yang.z.zhang@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: kvm@vger.kernel.org, mtosatti@redhat.com, xiantao.zhang@intel.com To: Yang Zhang Return-path: Received: from mx1.redhat.com ([209.132.183.28]:10532 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752530Ab3CRJpF (ORCPT ); Mon, 18 Mar 2013 05:45:05 -0400 Content-Disposition: inline In-Reply-To: <1363591479-4653-6-git-send-email-yang.z.zhang@intel.com> Sender: kvm-owner@vger.kernel.org List-ID: On Mon, Mar 18, 2013 at 03:24:36PM +0800, Yang Zhang wrote: > From: Yang Zhang > > Update destination vcpu map when ioapic entry or apic(id, ldr, dfr) is changed > > Signed-off-by: Yang Zhang > --- > virt/kvm/ioapic.c | 38 ++++++++++++++++++++++++++++++++++++-- > 1 files changed, 36 insertions(+), 2 deletions(-) > > diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c > index 4296116..659511d 100644 > --- a/virt/kvm/ioapic.c > +++ b/virt/kvm/ioapic.c > @@ -87,6 +87,36 @@ static unsigned long ioapic_read_indirect(struct kvm_ioapic *ioapic, > return result; > } > > +#ifdef CONFIG_X86 > +static void rtc_irq_get_dest_vcpu(struct kvm_ioapic *ioapic, int irq) > +{ > + union kvm_ioapic_redirect_entry *entry = &ioapic->redirtbl[irq]; > + struct kvm_lapic_irq irqe; > + You cannot access ioapic without taking ioapic lock. > + if (irq != 8 || entry->fields.mask) > + return; > + > + irqe.dest_id = entry->fields.dest_id; > + irqe.vector = entry->fields.vector; > + irqe.dest_mode = entry->fields.dest_mode; > + irqe.trig_mode = entry->fields.trig_mode; > + irqe.delivery_mode = entry->fields.delivery_mode << 8; > + irqe.level = 1; > + irqe.shorthand = 0; > + > + bitmap_zero(ioapic->rtc_status.vcpu_map, KVM_MAX_VCPUS); > + > + kvm_get_dest_vcpu(ioapic->kvm, &irqe, ioapic->rtc_status.vcpu_map); > +} > + > +#else > + > +static void rtc_irq_get_dest_vcpu(struct kvm_ioapic *ioapic, int irq) > +{ > + return; > +} > +#endif > + > static int ioapic_service(struct kvm_ioapic *ioapic, unsigned int idx) > { > union kvm_ioapic_redirect_entry *pent; > @@ -147,9 +177,13 @@ void kvm_scan_ioapic_entry(struct kvm *kvm) > { > struct kvm_ioapic *ioapic = kvm->arch.vioapic; > > - if (!kvm_apic_vid_enabled(kvm) || !ioapic) > + if (!ioapic) > return; > - kvm_make_update_eoibitmap_request(kvm); > + > + rtc_irq_get_dest_vcpu(ioapic, 8); > + > + if (kvm_apic_vid_enabled(kvm)) > + kvm_make_update_eoibitmap_request(kvm); > } > > static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val) > -- > 1.7.1 -- Gleb.