From patchwork Wed Mar 20 11:36:18 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: 2306861 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 C568040AFD for ; Wed, 20 Mar 2013 11:40:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757781Ab3CTLkp (ORCPT ); Wed, 20 Mar 2013 07:40:45 -0400 Received: from mga14.intel.com ([143.182.124.37]:14698 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756604Ab3CTLkj (ORCPT ); Wed, 20 Mar 2013 07:40:39 -0400 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga102.ch.intel.com with ESMTP; 20 Mar 2013 04:40:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,877,1355126400"; d="scan'208";a="216885412" Received: from yang-desktop.sh.intel.com ([10.239.47.153]) by AZSMGA002.ch.intel.com with ESMTP; 20 Mar 2013 04:40:37 -0700 From: Yang Zhang To: kvm@vger.kernel.org Cc: gleb@redhat.com, mtosatti@redhat.com, xiantao.zhang@intel.com, Yang Zhang Subject: [PATCH v4 6/7] KVM: Add reset/restore rtc_status support Date: Wed, 20 Mar 2013 19:36:18 +0800 Message-Id: <1363779379-20212-7-git-send-email-yang.z.zhang@intel.com> X-Mailer: git-send-email 1.7.1.1 In-Reply-To: <1363779379-20212-1-git-send-email-yang.z.zhang@intel.com> References: <1363779379-20212-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 | 2 ++ virt/kvm/ioapic.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 0 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index ed80244..e95312e 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 5806ef8..38815b0 100644 --- a/arch/x86/kvm/lapic.h +++ b/arch/x86/kvm/lapic.h @@ -154,4 +154,6 @@ static inline u16 apic_logical_id(struct kvm_apic_map *map, u32 ldr) return ldr & map->lid_mask; } +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 91b4c08..2b35123 100644 --- a/virt/kvm/ioapic.c +++ b/virt/kvm/ioapic.c @@ -158,11 +158,43 @@ void kvm_vcpu_scan_ioapic(struct kvm *kvm) return; kvm_make_scan_ioapic_request(kvm); } + +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.expected_eoi_bitmap); + } + } + ioapic->rtc_status.need_eoi = need_eoi; +} #else void kvm_vcpu_scan_ioapic(struct kvm *kvm) { return; } + +static void rtc_irq_reset(struct kvm_ioapic *ioapic) +{ + return; +} + +static void rtc_irq_restore(struct kvm_ioapic *ioapic) +{ + return; +} #endif static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val) @@ -441,6 +473,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); } @@ -506,6 +539,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_vcpu_scan_ioapic(kvm); spin_unlock(&ioapic->lock); return 0;