From patchwork Wed Aug 13 19:16:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Wang X-Patchwork-Id: 4717991 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7CCDAC0338 for ; Wed, 13 Aug 2014 10:52:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 54CCE201C8 for ; Wed, 13 Aug 2014 10:52:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E5813201B4 for ; Wed, 13 Aug 2014 10:52:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752014AbaHMKwW (ORCPT ); Wed, 13 Aug 2014 06:52:22 -0400 Received: from mga01.intel.com ([192.55.52.88]:22074 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751765AbaHMKwV (ORCPT ); Wed, 13 Aug 2014 06:52:21 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 13 Aug 2014 03:52:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,856,1400050800"; d="scan'208";a="584234163" Received: from unknown (HELO otc.sh.intel.com) ([10.239.48.112]) by fmsmga002.fm.intel.com with ESMTP; 13 Aug 2014 03:52:12 -0700 From: Wei Wang To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, Yang Zhang , Wei Wang Subject: [PATCH v2] KVM: x86: check ISR and TMR to construct eoi exit bitmap Date: Thu, 14 Aug 2014 03:16:25 +0800 Message-Id: <1407957385-36049-1-git-send-email-wei.w.wang@intel.com> X-Mailer: git-send-email 1.7.1 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-5.6 required=5.0 tests=BAYES_00, DATE_IN_FUTURE_06_12, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Yang Zhang Guest may mask the IOAPIC entry before issue EOI. In such case, EOI will not be intercepted by hypervisor due to the corrensponding bit in eoi exit bitmap is not setting. The solution is to check ISR + TMR to construct the EOI exit bitmap. This patch is a better fixing for the issue that commit "0f6c0a740b" tries to solve. Tested-by: Alex Williamson Signed-off-by: Yang Zhang Signed-off-by: Wei Wang --- arch/x86/kvm/lapic.c | 17 +++++++++++++++++ arch/x86/kvm/lapic.h | 2 ++ arch/x86/kvm/x86.c | 9 +++++++++ virt/kvm/ioapic.c | 7 ++++--- 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 08e8a89..0ed4bcb 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -515,6 +515,23 @@ static void pv_eoi_clr_pending(struct kvm_vcpu *vcpu) __clear_bit(KVM_APIC_PV_EOI_PENDING, &vcpu->arch.apic_attention); } +void kvm_apic_zap_eoi_exitmap(struct kvm_vcpu *vcpu, u64 *eoi_exit_bitmap, + u32 *tmr) +{ + u32 i, reg_off, intr_in_service; + struct kvm_lapic *apic = vcpu->arch.apic; + + for (i = 0; i < 8; i++) { + reg_off = 0x10 * i; + intr_in_service = apic_read_reg(apic, APIC_ISR + reg_off) & + kvm_apic_get_reg(apic, APIC_TMR + reg_off); + if (intr_in_service) { + *((u32 *)eoi_exit_bitmap + i) |= intr_in_service; + tmr[i] |= intr_in_service; + } + } +} + void kvm_apic_update_tmr(struct kvm_vcpu *vcpu, u32 *tmr) { struct kvm_lapic *apic = vcpu->arch.apic; diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h index 6a11845..4ee3d70 100644 --- a/arch/x86/kvm/lapic.h +++ b/arch/x86/kvm/lapic.h @@ -53,6 +53,8 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value); u64 kvm_lapic_get_base(struct kvm_vcpu *vcpu); void kvm_apic_set_version(struct kvm_vcpu *vcpu); +void kvm_apic_zap_eoi_exitmap(struct kvm_vcpu *vcpu, u64 *eoi_exit_bitmap, + u32 *tmr); void kvm_apic_update_tmr(struct kvm_vcpu *vcpu, u32 *tmr); void kvm_apic_update_irr(struct kvm_vcpu *vcpu, u32 *pir); int kvm_apic_match_physical_addr(struct kvm_lapic *apic, u16 dest); diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 204422d..755b556 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -6005,6 +6005,15 @@ static void vcpu_scan_ioapic(struct kvm_vcpu *vcpu) memset(tmr, 0, 32); kvm_ioapic_scan_entry(vcpu, eoi_exit_bitmap, tmr); + /* + * Guest may mask the IOAPIC entry before issue EOI. In such case, + * EOI will not be intercepted by hypervisor due to the corrensponding + * bit in eoi exit bitmap is not setting. + * + * The solution is to check ISR + TMR to construct the EOI exit bitmap. + */ + kvm_apic_zap_eoi_exitmap(vcpu, eoi_exit_bitmap, tmr); + kvm_x86_ops->load_eoi_exitmap(vcpu, eoi_exit_bitmap); kvm_apic_update_tmr(vcpu, tmr); } diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c index e8ce34c..2458a1d 100644 --- a/virt/kvm/ioapic.c +++ b/virt/kvm/ioapic.c @@ -254,9 +254,10 @@ void kvm_ioapic_scan_entry(struct kvm_vcpu *vcpu, u64 *eoi_exit_bitmap, spin_lock(&ioapic->lock); for (index = 0; index < IOAPIC_NUM_PINS; index++) { e = &ioapic->redirtbl[index]; - if (e->fields.trig_mode == IOAPIC_LEVEL_TRIG || - kvm_irq_has_notifier(ioapic->kvm, KVM_IRQCHIP_IOAPIC, index) || - index == RTC_GSI) { + if (!e->fields.mask && + (e->fields.trig_mode == IOAPIC_LEVEL_TRIG || + kvm_irq_has_notifier(ioapic->kvm, KVM_IRQCHIP_IOAPIC, + index) || index == RTC_GSI)) { if (kvm_apic_match_dest(vcpu, NULL, 0, e->fields.dest_id, e->fields.dest_mode)) { __set_bit(e->fields.vector,