From patchwork Mon Mar 18 07:24:37 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: 2285781 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 1E5D740AFD for ; Mon, 18 Mar 2013 07:29:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751818Ab3CRH33 (ORCPT ); Mon, 18 Mar 2013 03:29:29 -0400 Received: from mga01.intel.com ([192.55.52.88]:13296 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751678Ab3CRH3U (ORCPT ); Mon, 18 Mar 2013 03:29:20 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 18 Mar 2013 00:29:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,862,1355126400"; d="scan'208";a="304334893" Received: from yang-desktop.sh.intel.com ([10.239.47.153]) by fmsmga001.fm.intel.com with ESMTP; 18 Mar 2013 00:28:52 -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 6/8] KVM: Add reset/restore rtc_status support Date: Mon, 18 Mar 2013 15:24:37 +0800 Message-Id: <1363591479-4653-7-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 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); +} + 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); } @@ -527,6 +559,7 @@ int kvm_set_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state) spin_lock(&ioapic->lock); memcpy(ioapic, state, sizeof(struct kvm_ioapic_state)); update_handled_vectors(ioapic); + rtc_irq_restore(ioapic); kvm_scan_ioapic_entry(kvm); spin_unlock(&ioapic->lock); return 0;