mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Radim Krčmář" <rkrcmar@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>,
	Yoshida Nobuo <yoshida.nb@ncos.nec.co.jp>
Subject: [PATCH 2/3] KVM: x86: properly restore LVT0
Date: Tue, 30 Jun 2015 22:19:17 +0200	[thread overview]
Message-ID: <1435695558-3168-3-git-send-email-rkrcmar@redhat.com> (raw)
In-Reply-To: <1435695558-3168-1-git-send-email-rkrcmar@redhat.com>

Legacy NMI watchdog didn't work after migration/resume, because
vapics_in_nmi_mode was left at 0.

Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
---
 arch/x86/kvm/lapic.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index f49c7cca1de6..8dc32b5a4e0d 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -1824,6 +1824,7 @@ void kvm_apic_post_state_restore(struct kvm_vcpu *vcpu,
 	apic_update_ppr(apic);
 	hrtimer_cancel(&apic->lapic_timer.timer);
 	apic_update_lvtt(apic);
+	apic_manage_nmi_watchdog(apic, kvm_apic_get_reg(apic, APIC_LVT0));
 	update_divide_count(apic);
 	start_apic_timer(apic);
 	apic->irr_pending = true;
-- 
2.4.5


  parent reply	other threads:[~2015-06-30 20:25 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-30 20:19 [PATCH 0/3] KVM: x86: legacy NMI watchdog fixes Radim Krčmář
2015-06-30 20:19 ` [PATCH 1/3] KVM: x86: keep track of LVT0 changes under APICv Radim Krčmář
2015-06-30 20:19 ` Radim Krčmář [this message]
2015-07-01 13:29   ` [PATCH 2/3] KVM: x86: properly restore LVT0 Paolo Bonzini
2015-06-30 20:19 ` [PATCH 3/3] KVM: x86: make vapics_in_nmi_mode atomic Radim Krčmář
2015-07-01 13:33   ` Paolo Bonzini
2015-07-01 13:34 ` [PATCH 0/3] KVM: x86: legacy NMI watchdog fixes Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1435695558-3168-3-git-send-email-rkrcmar@redhat.com \
    --to=rkrcmar@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=yoshida.nb@ncos.nec.co.jp \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®