From patchwork Wed Nov 5 02:53:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Wei W" X-Patchwork-Id: 5231891 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 55390C11AC for ; Wed, 5 Nov 2014 02:53:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 490BE20145 for ; Wed, 5 Nov 2014 02:53:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7EDC92012E for ; Wed, 5 Nov 2014 02:53:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752382AbaKECxk (ORCPT ); Tue, 4 Nov 2014 21:53:40 -0500 Received: from mga09.intel.com ([134.134.136.24]:14428 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752039AbaKECxj (ORCPT ); Tue, 4 Nov 2014 21:53:39 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 04 Nov 2014 18:52:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,317,1413270000"; d="scan'208";a="631619986" Received: from unknown (HELO otc.sh.intel.com) ([10.239.48.51]) by orsmga002.jf.intel.com with ESMTP; 04 Nov 2014 18:53:37 -0800 From: Wei Wang To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, Wei Wang , Yang Zhang Subject: [PATCH] KVM: x86: reset RVI upon system reset Date: Wed, 5 Nov 2014 10:53:43 +0800 Message-Id: <1415156023-1349-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=-7.5 required=5.0 tests=BAYES_00, 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 A bug was reported as follows: when running Windows 7 32-bit guests on qemu-kvm, sometimes the guests run into blue screen during reboot. The problem was that a guest's RVI was not cleared when it rebooted. This patch has fixed the problem. Signed-off-by: Wei Wang Signed-off-by: Yang Zhang Tested-by: Rongrong Liu , Da Chun --- arch/x86/kvm/lapic.c | 3 +++ arch/x86/kvm/vmx.c | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 66dd173..6942742 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -1712,6 +1712,9 @@ void kvm_apic_post_state_restore(struct kvm_vcpu *vcpu, apic->isr_count = kvm_apic_vid_enabled(vcpu->kvm) ? 1 : count_vectors(apic->regs + APIC_ISR); apic->highest_isr_cache = -1; + if (kvm_x86_ops->hwapic_irr_update) + kvm_x86_ops->hwapic_irr_update(vcpu, + apic_find_highest_irr(apic)); kvm_x86_ops->hwapic_isr_update(vcpu->kvm, apic_find_highest_isr(apic)); kvm_make_request(KVM_REQ_EVENT, vcpu); kvm_rtc_eoi_tracking_restore_one(vcpu); diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index fe4d2f4..d632548 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -7292,19 +7292,19 @@ static void vmx_set_rvi(int vector) static void vmx_hwapic_irr_update(struct kvm_vcpu *vcpu, int max_irr) { if (max_irr == -1) + max_irr = 0; + + if (!is_guest_mode(vcpu)) { + vmx_set_rvi(max_irr); return; + } /* * If a vmexit is needed, vmx_check_nested_events handles it. */ - if (is_guest_mode(vcpu) && nested_exit_on_intr(vcpu)) + if ((is_guest_mode(vcpu) && nested_exit_on_intr(vcpu)) || max_irr == 0) return; - if (!is_guest_mode(vcpu)) { - vmx_set_rvi(max_irr); - return; - } - /* * Fall back to pre-APICv interrupt injection since L2 * is run without virtual interrupt delivery.