From: tip-bot for Marc Zyngier <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: christoffer.dall@linaro.org, marc.zyngier@arm.com,
linux-kernel@vger.kernel.org, tn@semihalf.com, hpa@zytor.com,
mingo@kernel.org, tglx@linutronix.de
Subject: [tip:timers/core] KVM: arm/arm64: timer: Switch to CLOCK_MONOTONIC_RAW
Date: Wed, 27 Jan 2016 03:43:41 -0800 [thread overview]
Message-ID: <tip-a6e707ddbdf150bd1c2a5c0eccc55abdc62a0039@git.kernel.org> (raw)
In-Reply-To: <1452879670-16133-4-git-send-email-marc.zyngier@arm.com>
Commit-ID: a6e707ddbdf150bd1c2a5c0eccc55abdc62a0039
Gitweb: http://git.kernel.org/tip/a6e707ddbdf150bd1c2a5c0eccc55abdc62a0039
Author: Marc Zyngier <marc.zyngier@arm.com>
AuthorDate: Fri, 15 Jan 2016 17:41:10 +0000
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Wed, 27 Jan 2016 12:38:04 +0100
KVM: arm/arm64: timer: Switch to CLOCK_MONOTONIC_RAW
In order to avoid NTP messing with the guest timer behind our back,
use the new and improved monotonic raw version of the hrtimers.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: Tomasz Nowicki <tn@semihalf.com>
Cc: Christoffer Dall <christoffer.dall@linaro.org>
Link: http://lkml.kernel.org/r/1452879670-16133-4-git-send-email-marc.zyngier@arm.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
virt/kvm/arm/arch_timer.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c
index 69bca18..97c5815 100644
--- a/virt/kvm/arm/arch_timer.c
+++ b/virt/kvm/arm/arch_timer.c
@@ -48,7 +48,7 @@ static bool timer_is_armed(struct arch_timer_cpu *timer)
static void timer_arm(struct arch_timer_cpu *timer, u64 ns)
{
timer->armed = true;
- hrtimer_start(&timer->timer, ktime_add_ns(ktime_get(), ns),
+ hrtimer_start(&timer->timer, ktime_add_ns(ktime_get_raw(), ns),
HRTIMER_MODE_ABS);
}
@@ -308,7 +308,7 @@ void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu)
struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;
INIT_WORK(&timer->expired, kvm_timer_inject_irq_work);
- hrtimer_init(&timer->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
+ hrtimer_init(&timer->timer, CLOCK_MONOTONIC_RAW, HRTIMER_MODE_ABS);
timer->timer.function = kvm_timer_expire;
}
prev parent reply other threads:[~2016-01-27 11:44 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-15 17:41 [PATCH 0/3] Enabling htimer support for CLOCK_MONOTONIC_RAW Marc Zyngier
2016-01-15 17:41 ` [PATCH 1/3] hrtimer: Add " Marc Zyngier
2016-01-27 11:42 ` [tip:timers/core] " tip-bot for Marc Zyngier
2016-03-02 11:30 ` Marc Zyngier
2016-03-03 10:27 ` [tip:timers/core] hrtimer: Revert CLOCK_MONOTONIC_RAW support tip-bot for Thomas Gleixner
2016-01-15 17:41 ` [PATCH 2/3] hrtimer: Catch illegal clockids Marc Zyngier
2016-01-27 11:43 ` [tip:timers/core] " tip-bot for Marc Zyngier
2017-02-18 10:01 ` [tip:timers/core] hrtimer: Catch invalid clockids again tip-bot for Marc Zyngier
2016-01-15 17:41 ` [PATCH 3/3] KVM: arm/arm64: timer: Switch to CLOCK_MONOTONIC_RAW Marc Zyngier
2016-01-27 11:43 ` tip-bot for Marc Zyngier [this message]
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=tip-a6e707ddbdf150bd1c2a5c0eccc55abdc62a0039@git.kernel.org \
--to=tipbot@zytor.com \
--cc=christoffer.dall@linaro.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=tn@semihalf.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;
as well as URLs for NNTP newsgroup(s).