From patchwork Wed Feb 1 13:01:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 722516 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3vD3Dh1lV6z9t0p; Thu, 2 Feb 2017 00:01:56 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical-com.20150623.gappssmtp.com header.i=@canonical-com.20150623.gappssmtp.com header.b="2NyFc54c"; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1cYuXo-0002JP-WB; Wed, 01 Feb 2017 13:01:52 +0000 Received: from mail-it0-f47.google.com ([209.85.214.47]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1cYuXg-0002H7-LZ for kernel-team@lists.ubuntu.com; Wed, 01 Feb 2017 13:01:44 +0000 Received: by mail-it0-f47.google.com with SMTP id c7so16573648itd.1 for ; Wed, 01 Feb 2017 05:01:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=v0Oz7yVQS1htP4jOE2qfl85PJb1SIL9zYHvaZ2BlzyM=; b=2NyFc54ckqWHWXAq9a1xOJYeJg6oGK5f+HUOH+QSMk2NIFeTbbjW/gszDlAN7yn09i bXAGeKsEXJOW2aDz5dCjir0TZeOzyFjyRw7Z7dvQv0/XCs5u2askLSivziwkGMYuuXpm /B2hZTnPZHmYRULNgOwcfzAMgUuPpjaHC6P4lgOVnM9eckOp1+BK7Atpmjua12Zkxfz4 fqRyEO13niF4lMcTvWuprIuYb5FcPXVrTdSpe7bENdW7UPzi8iig81stmLhXnz4U5DR7 zf5bPsdPPCTQfaMW9z/3NNmkp8G8Oan7Gt06roJ8LWygBdzmeNs6tXLMVjZuYoWhXDE1 dbnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=v0Oz7yVQS1htP4jOE2qfl85PJb1SIL9zYHvaZ2BlzyM=; b=JL4Zs2GiMgV35/nsia3enN8f1pmIhQJ4bsi1kIm1EmlVS98vx4tu9T1+x8mGzL2CPN dUmpHQaLeU3WES3kk1rpZMRq1RqApEo1MAX3cGY+327oYNm1M3QwOnhsRspChZex05+A 0bmixheN+ABslrm9ElSP2PFQMoYy4pJZzn8SIlzOVco6fwovnwOf8iMjilpAoOizsH2u MGstZGn1UfcIsp843tyevmROS/ZlFiCdNqMmuKsyMzThLCt/aa5PxFAxfQxTt54yKNzw Ab8PdFWfMrUDR8Y72AzKPMpQzRjJYRoWidIwUJfr+B/pj5FVyg9ljUi92xdwEEceVZHV A9Jg== X-Gm-Message-State: AIkVDXIZGNt+Iil+Aq1NubVnP9lwvScnzlAysBp/+6zaN4eJ9lW7YWzxuApdEukR2pulVKoZ X-Received: by 10.36.69.145 with SMTP id c17mr24641749itd.111.1485954103282; Wed, 01 Feb 2017 05:01:43 -0800 (PST) Received: from localhost.localdomain (host-98-127-250-84.bln-mt.client.bresnan.net. [98.127.250.84]) by smtp.gmail.com with ESMTPSA id g82sm11869327ioa.13.2017.02.01.05.01.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Feb 2017 05:01:42 -0800 (PST) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2] KVM: x86: reset RVI upon system reset Date: Wed, 1 Feb 2017 06:01:36 -0700 Message-Id: <1485954097-26456-2-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485954097-26456-1-git-send-email-tim.gardner@canonical.com> References: <1485909580-19185-1-git-send-email-seyeong.kim@canonical.com> <1485954097-26456-1-git-send-email-tim.gardner@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Wei Wang BugLink: http://bugs.launchpad.net/bugs/1660519 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 Signed-off-by: Paolo Bonzini (back ported from commit 4114c27d450bef228be9c7b0c40a888e18a3a636) Signed-off-by: Tim Gardner Conflicts: arch/x86/kvm/vmx.c --- arch/x86/kvm/lapic.c | 3 +++ arch/x86/kvm/vmx.c | 25 ++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 701fd95..b805ae4 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -1692,6 +1692,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 2b45251..6658c0b 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -6919,6 +6919,9 @@ static void vmx_set_rvi(int vector) u16 status; u8 old; + if (vector == -1) + vector = 0; + status = vmcs_read16(GUEST_INTR_STATUS); old = (u8)status & 0xff; if ((u8)vector != old) { @@ -6930,10 +6933,30 @@ static void vmx_set_rvi(int vector) static void vmx_hwapic_irr_update(struct kvm_vcpu *vcpu, int max_irr) { + if (!is_guest_mode(vcpu)) { + vmx_set_rvi(max_irr); + return; + } + if (max_irr == -1) return; - vmx_set_rvi(max_irr); + /* + * In guest mode. If a vmexit is needed, vmx_check_nested_events + * handles it. + */ + if (nested_exit_on_intr(vcpu)) + return; + + /* + * Else, fall back to pre-APICv interrupt injection since L2 + * is run without virtual interrupt delivery. + */ + if (!kvm_event_needs_reinjection(vcpu) && + vmx_interrupt_allowed(vcpu)) { + kvm_queue_interrupt(vcpu, max_irr, false); + vmx_inject_irq(vcpu); + } } static void vmx_load_eoi_exitmap(struct kvm_vcpu *vcpu, u64 *eoi_exit_bitmap)