From patchwork Mon Mar 18 07:24:32 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: 2285741 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id A6AB03FCF6 for ; Mon, 18 Mar 2013 07:29:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751548Ab3CRH3P (ORCPT ); Mon, 18 Mar 2013 03:29:15 -0400 Received: from mga11.intel.com ([192.55.52.93]:61578 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751106Ab3CRH3P (ORCPT ); Mon, 18 Mar 2013 03:29:15 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 18 Mar 2013 00:29:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,862,1355126400"; d="scan'208";a="304334777" Received: from yang-desktop.sh.intel.com ([10.239.47.153]) by fmsmga001.fm.intel.com with ESMTP; 18 Mar 2013 00:28:46 -0700 From: Yang Zhang To: kvm@vger.kernel.org Cc: gleb@redhat.com, mtosatti@redhat.com, xiantao.zhang@intel.com, Yang Zhang Subject: [PATCH v2 1/8] KVM: Parse ioapic entry to get destination vcpu Date: Mon, 18 Mar 2013 15:24:32 +0800 Message-Id: <1363591479-4653-2-git-send-email-yang.z.zhang@intel.com> X-Mailer: git-send-email 1.7.1.1 In-Reply-To: <1363591479-4653-1-git-send-email-yang.z.zhang@intel.com> References: <1363591479-4653-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 Get destination vcpu map from one ioapic entry. Signed-off-by: Yang Zhang --- arch/x86/kvm/lapic.c | 40 ++++++++++++++++++++++++---------------- arch/x86/kvm/lapic.h | 3 +++ 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 02b51dd..b4339a5 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -145,28 +145,26 @@ static inline int kvm_apic_id(struct kvm_lapic *apic) return (kvm_apic_get_reg(apic, APIC_ID) >> 24) & 0xff; } -void kvm_calculate_eoi_exitmap(struct kvm_vcpu *vcpu, - struct kvm_lapic_irq *irq, - u64 *eoi_exit_bitmap) +void kvm_get_dest_vcpu(struct kvm *kvm, struct kvm_lapic_irq *irq, + unsigned long *vcpu_map) { struct kvm_lapic **dst; struct kvm_apic_map *map; unsigned long bitmap = 1; + struct kvm_vcpu *vcpu; int i; rcu_read_lock(); - map = rcu_dereference(vcpu->kvm->arch.apic_map); + map = rcu_dereference(kvm->arch.apic_map); - if (unlikely(!map)) { - __set_bit(irq->vector, (unsigned long *)eoi_exit_bitmap); + if (unlikely(!map)) goto out; - } if (irq->dest_mode == 0) { /* physical mode */ - if (irq->delivery_mode == APIC_DM_LOWEST || - irq->dest_id == 0xff) { - __set_bit(irq->vector, - (unsigned long *)eoi_exit_bitmap); + if (irq->dest_id == 0xff) { + kvm_for_each_vcpu(i, vcpu, kvm) + if (apic_enabled(vcpu->arch.apic)) + set_bit(vcpu->vcpu_id, vcpu_map); goto out; } dst = &map->phys_map[irq->dest_id & 0xff]; @@ -181,17 +179,27 @@ void kvm_calculate_eoi_exitmap(struct kvm_vcpu *vcpu, for_each_set_bit(i, &bitmap, 16) { if (!dst[i]) continue; - if (dst[i]->vcpu == vcpu) { - __set_bit(irq->vector, - (unsigned long *)eoi_exit_bitmap); - break; - } + set_bit(dst[i]->vcpu->vcpu_id, vcpu_map); } out: rcu_read_unlock(); } +void kvm_calculate_eoi_exitmap(struct kvm_vcpu *vcpu, + struct kvm_lapic_irq *irq, + u64 *eoi_exit_bitmap) +{ + DECLARE_BITMAP(vcpu_map, KVM_MAX_VCPUS); + + memset(vcpu_map, 0, sizeof(vcpu_map)); + + kvm_get_dest_vcpu(vcpu->kvm, irq, vcpu_map); + if (test_bit(vcpu->vcpu_id, vcpu_map) || + bitmap_empty(vcpu_map, sizeof(vcpu_map))) + __set_bit(irq->vector, (unsigned long *)eoi_exit_bitmap); +} + static void recalculate_apic_map(struct kvm *kvm) { struct kvm_apic_map *new, *old = NULL; diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h index 1676d34..3a0f9d8 100644 --- a/arch/x86/kvm/lapic.h +++ b/arch/x86/kvm/lapic.h @@ -158,4 +158,7 @@ void kvm_calculate_eoi_exitmap(struct kvm_vcpu *vcpu, struct kvm_lapic_irq *irq, u64 *eoi_bitmap); +void kvm_get_dest_vcpu(struct kvm *kvm, struct kvm_lapic_irq *irq, + unsigned long *vcpu_map); + #endif