[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-a6e707ddbdf150bd1c2a5c0eccc55abdc62a0039@git.kernel.org>
Date: Wed, 27 Jan 2016 03:43:41 -0800
From: tip-bot for Marc Zyngier <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: christoffer.dall@...aro.org, marc.zyngier@....com,
linux-kernel@...r.kernel.org, tn@...ihalf.com, hpa@...or.com,
mingo@...nel.org, tglx@...utronix.de
Subject: [tip:timers/core] KVM: arm/arm64: timer:
Switch to CLOCK_MONOTONIC_RAW
Commit-ID: a6e707ddbdf150bd1c2a5c0eccc55abdc62a0039
Gitweb: http://git.kernel.org/tip/a6e707ddbdf150bd1c2a5c0eccc55abdc62a0039
Author: Marc Zyngier <marc.zyngier@....com>
AuthorDate: Fri, 15 Jan 2016 17:41:10 +0000
Committer: Thomas Gleixner <tglx@...utronix.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@....com>
Cc: Tomasz Nowicki <tn@...ihalf.com>
Cc: Christoffer Dall <christoffer.dall@...aro.org>
Link: http://lkml.kernel.org/r/1452879670-16133-4-git-send-email-marc.zyngier@arm.com
Signed-off-by: Thomas Gleixner <tglx@...utronix.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;
}
Powered by blists - more mailing lists