From patchwork Mon Mar 18 12:47:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Yang Z" X-Patchwork-Id: 2290991 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 55383E00E5 for ; Mon, 18 Mar 2013 12:52:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753019Ab3CRMwv (ORCPT ); Mon, 18 Mar 2013 08:52:51 -0400 Received: from mga03.intel.com ([143.182.124.21]:16631 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753054Ab3CRMwu (ORCPT ); Mon, 18 Mar 2013 08:52:50 -0400 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 18 Mar 2013 05:52:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,865,1355126400"; d="scan'208";a="272304283" Received: from yang-desktop.sh.intel.com ([10.239.47.153]) by azsmga001.ch.intel.com with ESMTP; 18 Mar 2013 05:52:48 -0700 From: Yang Zhang To: kvm@vger.kernel.org Cc: gleb@redhat.com, mtosatti@redhat.com, xiantao.zhang@intel.com, Yang Zhang Subject: [PATCH v3 5/8] KVM: Recalculate destination vcpu map Date: Mon, 18 Mar 2013 20:47:19 +0800 Message-Id: <1363610842-5878-6-git-send-email-yang.z.zhang@intel.com> X-Mailer: git-send-email 1.7.1.1 In-Reply-To: <1363610842-5878-1-git-send-email-yang.z.zhang@intel.com> References: <1363610842-5878-1-git-send-email-yang.z.zhang@intel.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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 | 40 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 38 insertions(+), 2 deletions(-) diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c index 4296116..329efe1 100644 --- a/virt/kvm/ioapic.c +++ b/virt/kvm/ioapic.c @@ -87,6 +87,38 @@ 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; + + if (irq != 8 || entry->fields.mask) + return; + + spin_lock(&ioapic->lock); + 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); + spin_unlock(&ioapic->lock); +} + +#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 +179,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)