From: Wanpeng Li <kernellwp@gmail.com>
To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Radim Krčmář" <rkrcmar@redhat.com>,
"Wanpeng Li" <wanpeng.li@hotmail.com>
Subject: [PATCH v2 1/4] KVM: LAPIC: Fix lapic timer mode transition
Date: Thu, 28 Sep 2017 18:04:56 -0700 [thread overview]
Message-ID: <1506647099-2688-2-git-send-email-wanpeng.li@hotmail.com> (raw)
In-Reply-To: <1506647099-2688-1-git-send-email-wanpeng.li@hotmail.com>
From: Wanpeng Li <wanpeng.li@hotmail.com>
SDM 10.5.4.1 TSC-Deadline Mode mentioned that "Transitioning between TSC-Deadline
mode and other timer modes also disarms the timer". So the APIC Timer Initial Count
Register for one-shot/periodic mode should be reset. This patch do it.
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com>
---
arch/x86/include/asm/apicdef.h | 1 +
arch/x86/kvm/lapic.c | 3 +++
2 files changed, 4 insertions(+)
diff --git a/arch/x86/include/asm/apicdef.h b/arch/x86/include/asm/apicdef.h
index c46bb99..d8ef1b4 100644
--- a/arch/x86/include/asm/apicdef.h
+++ b/arch/x86/include/asm/apicdef.h
@@ -100,6 +100,7 @@
#define APIC_TIMER_BASE_CLKIN 0x0
#define APIC_TIMER_BASE_TMBASE 0x1
#define APIC_TIMER_BASE_DIV 0x2
+#define APIC_LVT_TIMER_MASK (3 << 17)
#define APIC_LVT_TIMER_ONESHOT (0 << 17)
#define APIC_LVT_TIMER_PERIODIC (1 << 17)
#define APIC_LVT_TIMER_TSCDEADLINE (2 << 17)
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 69c5612..a739cbb 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -1722,6 +1722,9 @@ int kvm_lapic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val)
break;
case APIC_LVTT:
+ if (apic_lvtt_tscdeadline(apic) != ((val &
+ APIC_LVT_TIMER_MASK) == APIC_LVT_TIMER_TSCDEADLINE))
+ kvm_lapic_set_reg(apic, APIC_TMICT, 0);
if (!kvm_apic_sw_enabled(apic))
val |= APIC_LVT_MASKED;
val &= (apic_lvt_mask[0] | apic->lapic_timer.timer_mode_mask);
--
2.7.4
next prev parent reply other threads:[~2017-09-29 1:05 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-29 1:04 [PATCH v2 0/4] KVM: LAPIC: Rework lapic timer to behave more like real-hardware Wanpeng Li
2017-09-29 1:04 ` Wanpeng Li [this message]
2017-10-03 17:05 ` [PATCH v2 1/4] KVM: LAPIC: Fix lapic timer mode transition Radim Krčmář
2017-10-04 1:45 ` Wanpeng Li
2017-10-04 13:21 ` Radim Krčmář
2017-10-04 13:50 ` Wanpeng Li
2017-10-04 14:02 ` Wanpeng Li
2017-09-29 1:04 ` [PATCH v2 2/4] KVM: LAPIC: Keep timer running when switching between one-shot and periodic mode Wanpeng Li
2017-10-03 17:06 ` Radim Krčmář
2017-10-04 1:46 ` Wanpeng Li
2017-10-04 13:33 ` Radim Krčmář
2017-10-04 13:57 ` Wanpeng Li
2017-09-29 1:04 ` [PATCH v2 3/4] KVM: LAPIC: Apply change to TDCR right away to the timer Wanpeng Li
2017-10-03 17:28 ` Radim Krčmář
2017-10-04 1:59 ` Wanpeng Li
2017-10-04 12:43 ` Radim Krčmář
2017-09-29 1:04 ` [PATCH v2 4/4] KVM: LAPIC: Don't silently accept bad vectors Wanpeng Li
2017-10-03 17:53 ` Radim Krčmář
2017-10-04 7:56 ` Wanpeng Li
2017-10-04 12:01 ` Radim Krčmář
2017-10-04 14:16 ` Wanpeng Li
2017-10-04 14:44 ` Radim Krčmář
2017-10-13 1:17 ` Wanpeng Li
2017-10-13 17:36 ` Radim Krčmář
2017-10-13 20:31 ` Radim Krčmář
2017-10-15 2:41 ` Wanpeng Li
2017-10-05 10:57 ` [PATCH v2 0/4] KVM: LAPIC: Rework lapic timer to behave more like real-hardware Wanpeng Li
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=1506647099-2688-2-git-send-email-wanpeng.li@hotmail.com \
--to=kernellwp@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=rkrcmar@redhat.com \
--cc=wanpeng.li@hotmail.com \
/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®